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/heat/nested | |
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/nested')
22 files changed, 12 insertions, 257 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multi/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multi/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml index ef3d1f6c60..4fec5b52c3 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multi/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multi/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.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: @@ -393,4 +383,4 @@ topology_template: - link local_storage_server_pcm_1: - server_pcm_1 - - local_storage
\ No newline at end of file + - local_storage diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multi/expectedoutputfiles/nested-pcm_v0.1_2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multi/expectedoutputfiles/nested-pcm_v0.1_2ServiceTemplate.yaml index 9e8bb123dd..c8f63361d5 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multi/expectedoutputfiles/nested-pcm_v0.1_2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multi/expectedoutputfiles/nested-pcm_v0.1_2ServiceTemplate.yaml @@ -85,11 +85,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: @@ -128,11 +123,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: @@ -379,4 +369,4 @@ topology_template: - dependency local_storage_server_pcm_2: - server_pcm_2 - - local_storage
\ No newline at end of file + - local_storage diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multiple_resource_groups/expectedoutputfiles/mvs.nested.heatServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multiple_resource_groups/expectedoutputfiles/mvs.nested.heatServiceTemplate.yaml index 74283924ae..793a9e4291 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multiple_resource_groups/expectedoutputfiles/mvs.nested.heatServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multiple_resource_groups/expectedoutputfiles/mvs.nested.heatServiceTemplate.yaml @@ -218,11 +218,6 @@ topology_template: ip_count_required: is_required: false floating_ip_count_required: - is_required: true - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: is_required: false security_groups: - get_input: sec_groups diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested2levels/expectedoutputfiles/nested2levelServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested2levels/expectedoutputfiles/nested2levelServiceTemplate.yaml index 4e745408ea..f360724a3b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested2levels/expectedoutputfiles/nested2levelServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested2levels/expectedoutputfiles/nested2levelServiceTemplate.yaml @@ -78,11 +78,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: shared_security_group_id1 - get_input: p2 @@ -111,11 +106,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: shared_security_group_id1 fixed_ips: @@ -359,4 +349,4 @@ topology_template: - local_storage dependency_server_cmaui_2: - server_cmaui_2 - - dependency
\ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested2levels/expectedoutputfiles/nestedServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested2levels/expectedoutputfiles/nestedServiceTemplate.yaml index 27a8e225d1..aa8cf3245c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested2levels/expectedoutputfiles/nestedServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested2levels/expectedoutputfiles/nestedServiceTemplate.yaml @@ -65,11 +65,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: shared_security_group_id1 fixed_ips: @@ -125,11 +120,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: shared_security_group_id1 - get_input: p2 @@ -600,4 +590,4 @@ topology_template: - dependency dependency_cmaui_port_2: - cmaui_port_2 - - dependency
\ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/nested2levelServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/nested2levelServiceTemplate.yaml index aaa758090d..6eaa43fa49 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/nested2levelServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/nested2levelServiceTemplate.yaml @@ -89,11 +89,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: shared_security_group_id1 - get_input: p2 @@ -122,11 +117,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: shared_security_group_id1 fixed_ips: @@ -590,4 +580,4 @@ topology_template: - dependency_cmaui_port_322 dependency_server_cmaui_2: - server_cmaui_2 - - dependency
\ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/nested3levelServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/nested3levelServiceTemplate.yaml index 81ba3f4d07..59344ca13c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/nested3levelServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/nested3levelServiceTemplate.yaml @@ -78,11 +78,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: shared_security_group_id1 - get_input: p2 @@ -111,11 +106,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: shared_security_group_id1 fixed_ips: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/nestedServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/nestedServiceTemplate.yaml index a09fbad5fe..dccdb95085 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/nestedServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/nestedServiceTemplate.yaml @@ -65,11 +65,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: shared_security_group_id1 fixed_ips: @@ -121,11 +116,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: shared_security_group_id1 - get_input: p2 @@ -809,4 +799,4 @@ topology_template: - dependency link_cmaui_port_211_test_nested2: - test_nested2 - - link_cmaui_port_211
\ No newline at end of file + - link_cmaui_port_211 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/module_1_perimeta_swmu_a_childServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/module_1_perimeta_swmu_a_childServiceTemplate.yaml index aa69d20865..49a49f526c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/module_1_perimeta_swmu_a_childServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/module_1_perimeta_swmu_a_childServiceTemplate.yaml @@ -210,11 +210,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: perimeta_sec_groups
fixed_ips:
@@ -248,11 +243,6 @@ topology_template: 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
security_groups:
get_input: perimeta_sec_groups
fixed_ips:
@@ -289,11 +279,6 @@ topology_template: 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
security_groups:
get_input: perimeta_sec_groups
fixed_ips:
@@ -375,11 +360,6 @@ topology_template: 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
security_groups:
get_input: perimeta_sec_groups
fixed_ips:
@@ -416,11 +396,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
@@ -449,11 +424,6 @@ topology_template: 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
security_groups:
get_input: perimeta_sec_groups
fixed_ips:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/module_1_perimeta_swmu_b_childServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/module_1_perimeta_swmu_b_childServiceTemplate.yaml index 2eb36bf664..406756105c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/module_1_perimeta_swmu_b_childServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/module_1_perimeta_swmu_b_childServiceTemplate.yaml @@ -205,11 +205,6 @@ topology_template: 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
security_groups:
get_input: perimeta_sec_groups
fixed_ips:
@@ -246,11 +241,6 @@ topology_template: 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
security_groups:
get_input: perimeta_sec_groups
fixed_ips:
@@ -332,11 +322,6 @@ topology_template: 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
security_groups:
get_input: perimeta_sec_groups
fixed_ips:
@@ -373,11 +358,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
@@ -438,11 +418,6 @@ topology_template: 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
security_groups:
get_input: perimeta_sec_groups
fixed_ips:
@@ -479,11 +454,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: perimeta_sec_groups
fixed_ips:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/module_2_perimeta_sw_a_childServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/module_2_perimeta_sw_a_childServiceTemplate.yaml index 00014913fb..8d11d9b6e4 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/module_2_perimeta_sw_a_childServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/module_2_perimeta_sw_a_childServiceTemplate.yaml @@ -286,11 +286,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
security_groups:
get_input: perimeta_sec_groups
@@ -334,11 +329,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: perimeta_sec_groups
fixed_ips:
@@ -375,11 +365,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
security_groups:
get_input: perimeta_sec_groups
@@ -467,11 +452,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
security_groups:
get_input: perimeta_sec_groups
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/module_2_perimeta_sw_b_childServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/module_2_perimeta_sw_b_childServiceTemplate.yaml index 171b3ef1c4..f71b4500fa 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/module_2_perimeta_sw_b_childServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/module_2_perimeta_sw_b_childServiceTemplate.yaml @@ -226,11 +226,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
security_groups:
get_input: perimeta_sec_groups
@@ -273,11 +268,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
security_groups:
get_input: perimeta_sec_groups
@@ -412,11 +402,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: perimeta_sec_groups
fixed_ips:
@@ -453,11 +438,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
security_groups:
get_input: perimeta_sec_groups
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml index 69d7786fbd..bc34c490e9 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml @@ -111,11 +111,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: @@ -182,11 +177,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: @@ -684,4 +674,4 @@ topology_template: - dependency link_pcm_port_01_server_pcm_005: - server_pcm_005 - - link_pcm_port_01
\ No newline at end of file + - link_pcm_port_01 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/expectedoutputfiles/nested-pcm_v0.1_2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/expectedoutputfiles/nested-pcm_v0.1_2ServiceTemplate.yaml index 6325a90bc9..ca72528fd8 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/expectedoutputfiles/nested-pcm_v0.1_2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/expectedoutputfiles/nested-pcm_v0.1_2ServiceTemplate.yaml @@ -85,11 +85,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: @@ -133,11 +128,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: @@ -400,4 +390,4 @@ topology_template: - dependency dependency_network_2: - network_2 - - dependency
\ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resourceGroupIndexVar/expectedoutputfiles/mvs.nested.heatServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resourceGroupIndexVar/expectedoutputfiles/mvs.nested.heatServiceTemplate.yaml index e803f80172..4a8981d0fc 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resourceGroupIndexVar/expectedoutputfiles/mvs.nested.heatServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resourceGroupIndexVar/expectedoutputfiles/mvs.nested.heatServiceTemplate.yaml @@ -155,11 +155,6 @@ topology_template: ip_count_required: is_required: false floating_ip_count_required: - is_required: true - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: is_required: false security_groups: - get_input: sec_groups diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resourceGroupMDNS/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resourceGroupMDNS/expectedoutputfiles/MainServiceTemplate.yaml index bf58cb5529..24aa8acc0b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resourceGroupMDNS/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resourceGroupMDNS/expectedoutputfiles/MainServiceTemplate.yaml @@ -348,4 +348,4 @@ topology_template: heat_file: ../Artifacts/dns_az_01.yaml description: DNS master template members: - - dns_server_group_az + - dns_server_group_az
\ 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/nested/resourceGroupMDNS/expectedoutputfiles/dns_nested_01ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resourceGroupMDNS/expectedoutputfiles/dns_nested_01ServiceTemplate.yaml index eb13585bbc..020c022d37 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resourceGroupMDNS/expectedoutputfiles/dns_nested_01ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resourceGroupMDNS/expectedoutputfiles/dns_nested_01ServiceTemplate.yaml @@ -114,11 +114,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 fixed_ips: @@ -152,11 +147,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 fixed_ips: @@ -435,4 +425,4 @@ topology_template: - link dependency_dns_int_bearer_0_port: - dns_int_bearer_0_port - - dependency
\ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resource_group/expectedoutputfiles/mvs.nested.heatServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resource_group/expectedoutputfiles/mvs.nested.heatServiceTemplate.yaml index e803f80172..4a8981d0fc 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resource_group/expectedoutputfiles/mvs.nested.heatServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resource_group/expectedoutputfiles/mvs.nested.heatServiceTemplate.yaml @@ -155,11 +155,6 @@ topology_template: ip_count_required: is_required: false floating_ip_count_required: - is_required: true - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: is_required: false security_groups: - get_input: sec_groups diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resource_group_with_dynamic_count/expectedoutputfiles/mvs.nested.heatServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resource_group_with_dynamic_count/expectedoutputfiles/mvs.nested.heatServiceTemplate.yaml index 74283924ae..793a9e4291 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resource_group_with_dynamic_count/expectedoutputfiles/mvs.nested.heatServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resource_group_with_dynamic_count/expectedoutputfiles/mvs.nested.heatServiceTemplate.yaml @@ -218,11 +218,6 @@ topology_template: ip_count_required: is_required: false floating_ip_count_required: - is_required: true - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: is_required: false security_groups: - get_input: sec_groups diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/reusenestedfrommultibase/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/reusenestedfrommultibase/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml index aa195d50e5..6283861921 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/reusenestedfrommultibase/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/reusenestedfrommultibase/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.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: @@ -142,11 +137,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: @@ -393,4 +383,4 @@ topology_template: - dependency dependency_pcm_port_1: - pcm_port_1 - - dependency
\ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/single/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/single/expectedoutputfiles/MainServiceTemplate.yaml index e4d0747ac2..973d8c0409 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/single/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/single/expectedoutputfiles/MainServiceTemplate.yaml @@ -303,11 +303,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 @@ -364,4 +359,4 @@ topology_template: value: get_attribute: - server_pcm_001 - - pcm_vol
\ No newline at end of file + - pcm_vol diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/single/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/single/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml index 8be5a4fa56..6283861921 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/single/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/single/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.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: @@ -142,11 +137,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: |