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>

2 files changed, 100 insertions, 66 deletions

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/neutron_dual_stacks/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/neutron_dual_stacks/expectedoutputfiles/MainServiceTemplate.yaml
index a922d0ff52..791aafea88 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/neutron_dual_stacks/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/neutron_dual_stacks/expectedoutputfiles/MainServiceTemplate.yaml
@@ -37,6 +37,36 @@ topology_template:
       description: DNS Bearer IP list
       entry_schema:
         type: string
+    dns_oam_protected_floating_v6_ip:
+      hidden: false
+      immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - Use_Case_1_module
+            source_type: HEAT
+            param_name: dns_oam_protected_floating_v6_ip
+      type: list
+      description: floating IPv6 assignment for VM's on the oam_protected
+      entry_schema:
+        type: string
+    dns_int_bearer_floating_v6_ip:
+      hidden: false
+      immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - Use_Case_1_module
+            source_type: HEAT
+            param_name: dns_int_bearer_floating_v6_ip
+      type: list
+      description: floating IPv6 assignment for VM's on the Bearer network
+      entry_schema:
+        type: string
     vnf_name:
       hidden: false
       immutable: false
@@ -135,6 +165,21 @@ topology_template:
       description: server name
       entry_schema:
         type: string
+    dns_oam_protected_floating_ip:
+      hidden: false
+      immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - Use_Case_1_module
+            source_type: HEAT
+            param_name: dns_oam_protected_floating_ip
+      type: list
+      description: floating IPv4 assignment for VM's on the oam_protected
+      entry_schema:
+        type: string
     vnf_id:
       hidden: false
       immutable: false
@@ -217,6 +262,21 @@ topology_template:
       type: string
       description: server flavor
       default: nv.c4r4d80
+    dns_int_bearer_floating_ip:
+      hidden: false
+      immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - Use_Case_1_module
+            source_type: HEAT
+            param_name: dns_int_bearer_floating_ip
+      type: list
+      description: floating IPv4 assignment for VM's on the Bearer network
+      entry_schema:
+        type: string
   node_templates:
     dns_0_oam_protected_port_0:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
@@ -239,17 +299,11 @@ topology_template:
             is_required: false
         allowed_address_pairs:
         - ip_address:
-            get_input:
-            - dns_oam_protected_ips
-            - 5
+            get_input: dns_oam_protected_floating_ip
         - ip_address:
-            get_input:
-            - dns_oam_protected_floating_v6_ip
-            - 5
+            get_input: dns_oam_protected_floating_v6_ip
         - ip_address:
-            get_input:
-            - dns_oam_protected_ips
-            - 5
+            get_input: dns_oam_protected_floating_ip
         name:
           str_replace:
             template: VNF_NAME_dns_0_oam_protected_port_0
@@ -268,11 +322,6 @@ topology_template:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         ip_requirements:
-        - ip_version: 4
-          ip_count_required:
-            is_required: false
-          floating_ip_count_required:
-            is_required: false
         - ip_version: 6
           ip_count_required:
             is_required: true
@@ -283,7 +332,7 @@ topology_template:
         fixed_ips:
         - ip_address:
             get_input:
-            - dns_int_bearer_ips_v6_ips
+            - dns_int_bearer_v6_ips
             - 0
         mac_requirements:
           mac_count_required:
@@ -310,7 +359,7 @@ topology_template:
           ip_count_required:
             is_required: true
           floating_ip_count_required:
-            is_required: false
+            is_required: true
         - ip_version: 6
           ip_count_required:
             is_required: true
@@ -332,13 +381,9 @@ topology_template:
             is_required: false
         allowed_address_pairs:
         - ip_address:
-            get_input:
-            - dns_int_bearer_floating_v6_ip
-            - 0
+            get_input: dns_int_bearer_floating_v6_ip
         - ip_address:
-            get_input:
-            - dns_int_bearer_floating_v6_ip
-            - 0
+            get_input: dns_int_bearer_floating_ip
         name:
           str_replace:
             template: VNF_NAME_dns_bearer_port
@@ -461,7 +506,7 @@ topology_template:
           ip_count_required:
             is_required: true
           floating_ip_count_required:
-            is_required: false
+            is_required: true
         security_groups:
         - get_input: security_group
         fixed_ips:
@@ -478,13 +523,9 @@ topology_template:
             is_required: false
         allowed_address_pairs:
         - ip_address:
-            get_input:
-            - dns_int_bearer
-            - 0
+            get_input: dns_int_bearer_floating_v6_ip
         - ip_address:
-            get_input:
-            - dns_int_bearer
-            - 0
+            get_input: dns_int_bearer_floating_ip
         name:
           str_replace:
             template: VNF_NAME_dns_bearer_port
@@ -528,11 +569,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: true
         security_groups:
         - get_input: security_group
         fixed_ips:
@@ -553,17 +589,9 @@ topology_template:
             is_required: false
         allowed_address_pairs:
         - ip_address:
-            get_input:
-            - dns_oam_protected_ips
-            - 5
-        - ip_address:
-            get_input:
-            - dns_oam_protected_floating_v6_ip
-            - 5
+            get_input: dns_oam_protected_floating_ip
         - ip_address:
-            get_input:
-            - dns_oam_protected_ips
-            - 5
+            get_input: dns_oam_protected_floating_ip
         name:
           str_replace:
             template: VNF_NAME_dns_1_oam_protected_port_0
@@ -582,12 +610,12 @@ topology_template:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         ip_requirements:
-        - ip_version: 4
+        - ip_version: 6
           ip_count_required:
             is_required: true
           floating_ip_count_required:
             is_required: true
-        - ip_version: 6
+        - ip_version: 4
           ip_count_required:
             is_required: true
           floating_ip_count_required:
@@ -612,17 +640,11 @@ topology_template:
             is_required: false
         allowed_address_pairs:
         - ip_address:
-            get_input:
-            - dns_oam_protected_floating_v6_ip
-            - 4
+            get_input: dns_oam_protected_floating_v6_ip
         - ip_address:
-            get_input:
-            - dns_oam_protected_ips
-            - 5
+            get_input: dns_oam_protected_floating_ip
         - ip_address:
-            get_input:
-            - dns_oam_protected_floating_v6_ip
-            - 5
+            get_input: dns_oam_protected_floating_v6_ip
         name:
           str_replace:
             template: VNF_NAME_dns_1_oam_protected_port_1
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/neutron_dual_stacks/inputfiles/Use_Case_1_module.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/neutron_dual_stacks/inputfiles/Use_Case_1_module.yaml
index b787785643..136fba45d3 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/neutron_dual_stacks/inputfiles/Use_Case_1_module.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/neutron_dual_stacks/inputfiles/Use_Case_1_module.yaml
@@ -29,6 +29,18 @@ parameters:
   dns_int_bearer_v6_ips:
     type: comma_delimited_list
     description: fixed IPv6 assignment for VM's on the Bearer network
+  dns_int_bearer_floating_v6_ip:
+    type: comma_delimited_list
+    description: floating IPv6 assignment for VM's on the Bearer network
+  dns_int_bearer_floating_ip:
+    type: comma_delimited_list
+    description: floating IPv4 assignment for VM's on the Bearer network
+  dns_oam_protected_floating_v6_ip:
+    type: comma_delimited_list
+    description: floating IPv6 assignment for VM's on the oam_protected
+  dns_oam_protected_floating_ip:
+    type: comma_delimited_list
+    description: floating IPv4 assignment for VM's on the oam_protected
   dns_names:
     type: comma_delimited_list
     description: server name
@@ -53,7 +65,7 @@ parameters:
     type: string
     description: Unique ID for this VF module instance
 #   For manual spinups, value must be in the ENV file. Must be removed from ENV before uploading to ASDC
-    
+
 resources:
 
   dns_0_oam_protected_port_0:
@@ -65,7 +77,7 @@ resources:
            params:
                VNF_NAME: {get_param: vnf_name}
       network: { get_param: oam_protected_net_name }
-      allowed_address_pairs: [{ "ip_address": { get_param: [ dns_oam_protected_ips, 5 ]}}, { "ip_address": { get_param: [ dns_oam_protected_floating_v6_ip, 5 ]}}, { "ip_address": { get_param: [ dns_oam_protected_ips, 5 ]}}]
+      allowed_address_pairs: [{ "ip_address": { get_param: dns_oam_protected_floating_ip}}, { "ip_address": { get_param: dns_oam_protected_floating_v6_ip}}, { "ip_address": { get_param: dns_oam_protected_floating_ip}}]
       security_groups: [{ get_param: security_group }]
 
   dns_0_oam_protected_port_1:
@@ -77,9 +89,9 @@ resources:
            params:
                VNF_NAME: {get_param: vnf_name}
       network: { get_param: oam_protected_net_name }
-      fixed_ips: [{ "ip_address": { get_param: [ dns_int_bearer_ips_v6_ips, 0 ]}}]
+      fixed_ips: [{ "ip_address": { get_param: [ dns_int_bearer_v6_ips, 0 ]}}]
       security_groups: [{ get_param: security_group }]
- 
+
   dns_0_int_bearer_port:
     type: OS::Neutron::Port
     properties:
@@ -90,7 +102,7 @@ resources:
               VNF_NAME: {get_param: vnf_name}
       network: { get_param: int_bearer_net_name }
       fixed_ips: [{ "ip_address": { get_param: [ dns_int_bearer_ips, 0 ]}}, { "ip_address": { get_param: [ dns_int_bearer_v6_ips, 0 ]}}]
-      allowed_address_pairs: [{ "ip_address": { get_param: [ dns_int_bearer, 0 ]}}, { "ip_address": { get_param: [ dns_int_bearer, 0 ]}}]
+      allowed_address_pairs: [{ "ip_address": { get_param: dns_int_bearer_floating_v6_ip}}, { "ip_address": { get_param: dns_int_bearer_floating_ip}}]
       security_groups: [{ get_param: security_group }]
 
   dns_server_0:
@@ -107,7 +119,7 @@ resources:
       metadata:
         vnf_id: { get_param: vnf_id }
         vf_module_id: { get_param: vf_module_id }
-        vnf_name:  {get_param: vnf_name }  
+        vnf_name:  {get_param: vnf_name }
 
   dns_1_oam_protected_port_0:
     type: OS::Neutron::Port
@@ -119,7 +131,7 @@ resources:
                VNF_NAME: {get_param: vnf_name}
       network: { get_param: oam_protected_net_name }
       fixed_ips: [{ "ip_address": { get_param: [ dns_oam_protected_ips, 6 ]}}, { "ip_address": { get_param: [ dns_oam_protected_ips, 7 ]}}, { "ip_address": { get_param: [ dns_oam_protected_ips, 5 ]}}]
-      allowed_address_pairs: [{ "ip_address": { get_param: [ dns_oam_protected_ips, 5 ]}}, { "ip_address": { get_param: [ dns_oam_protected_floating_v6_ip, 5 ]}}, { "ip_address": { get_param: [ dns_oam_protected_ips, 5 ]}}]
+      allowed_address_pairs: [{ "ip_address": { get_param: dns_oam_protected_floating_ip}}, { "ip_address": { get_param: dns_oam_protected_floating_ip}}]
       security_groups: [{ get_param: security_group }]
 
   dns_1_oam_protected_port_1:
@@ -132,9 +144,9 @@ resources:
                VNF_NAME: {get_param: vnf_name}
       network: { get_param: oam_protected_net_name }
       fixed_ips: [{ "ip_address": { get_param: [ dns_oam_protected_v6_ips, 6 ]}}, { "ip_address": { get_param: [ dns_oam_protected_ips, 7 ]}}, { "ip_address": { get_param: [ dns_oam_protected_ips, 5 ]}}]
-      allowed_address_pairs: [{ "ip_address": { get_param: [ dns_oam_protected_floating_v6_ip, 4 ]}}, { "ip_address": { get_param: [ dns_oam_protected_ips, 5 ]}}, { "ip_address": { get_param: [ dns_oam_protected_floating_v6_ip, 5 ]}}]
+      allowed_address_pairs: [{ "ip_address": { get_param: dns_oam_protected_floating_v6_ip}}, { "ip_address": { get_param: dns_oam_protected_floating_ip}}, { "ip_address": { get_param: dns_oam_protected_floating_v6_ip}}]
       security_groups: [{ get_param: security_group }]
- 
+
   dns_1_int_bearer_port:
     type: OS::Neutron::Port
     properties:
@@ -145,7 +157,7 @@ resources:
               VNF_NAME: {get_param: vnf_name}
       network: { get_param: int_bearer_net_name }
       fixed_ips: [{ "ip_address": { get_param: [ dns_int_bearer_ips, 0 ]}}, { "ip_address": { get_param: [ dns_int_bearer_v6_ips, 0 ]}}]
-      allowed_address_pairs: [{ "ip_address": { get_param: [ dns_int_bearer_floating_v6_ip, 0 ]}}, { "ip_address": { get_param: [ dns_int_bearer_floating_v6_ip, 0 ]}}]
+      allowed_address_pairs: [{ "ip_address": { get_param: dns_int_bearer_floating_v6_ip}}, { "ip_address": { get_param: dns_int_bearer_floating_ip}}]
       security_groups: [{ get_param: security_group }]
 
   dns_server_1:
@@ -162,6 +174,6 @@ resources:
       metadata:
         vnf_id: { get_param: vnf_id }
         vf_module_id: { get_param: vf_module_id }
-        vnf_name:  {get_param: vnf_name }  
+        vnf_name:  {get_param: vnf_name }