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>

4 files changed, 0 insertions, 100 deletions

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