fix VM grouping

ignoring fixed_ips value when consolidating VMs

Issue-ID: SDC-774

Change-Id: Icdd88af94ff0609f6efabf69b00ed09836270fff
Signed-off-by: talio <tali.orenbach@amdocs.com>

5 files changed, 23 insertions, 45 deletions

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/in/base_vIECCF.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/in/base_vIECCF.yml
index 1e5d74c9ac..6025cd8344 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/in/base_vIECCF.yml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/in/base_vIECCF.yml
@@ -441,9 +441,6 @@ resources:
                             - fixed_ips
                             - 0
                             - ip_address
-            fixed_ips:
-                -
-                    ip_address: {get_param: [plt_oam_ips, 0]}
             security_groups:
 #                get_param: plt_security_groups
                 get_param: oam_security_groups
@@ -795,15 +792,10 @@ resources:
                     ip_address:
                         get_attr:
                             - 'network:io:vip:m004:m003'
-#                            - 'network_io_vip_m004_m003'
                             - fixed_ips
                             - 0
                             - ip_address
-            fixed_ips:
-                -
-                    ip_address: {get_param: [iox_oam_ips, 0]}
             security_groups:
-#                get_param: iox_security_groups
                 get_param: oam_security_groups
         metadata:
             os_net: { get_param: oam_net_id }
@@ -1162,9 +1154,6 @@ resources:
                             get_param: vnf_name
             network: { get_param: oam_net_id }
             replacement_policy: AUTO
-            fixed_ips:
-                -
-                    ip_address: {get_param: [app_oam_ips, 0]}
                     
             security_groups:
 #                get_param: app_security_groups
@@ -1481,9 +1470,6 @@ resources:
                             get_param: vnf_name
             network: { get_param: data_net_id }
             replacement_policy: AUTO
-            fixed_ips:
-                -
-                    ip_address: {get_param: [app_data_v6_ips, 2]}
             security_groups:
 #                get_param: app_security_groups
                 get_param: data_security_groups
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/MainServiceTemplate.yaml
index 22ad2137d2..e26a807c29 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/MainServiceTemplate.yaml
@@ -631,11 +631,6 @@ topology_template:
         - get_input: oam_net_id
         vm_flavor_name:
           get_input: app_flavor_name
-        port_app_data_0_port_fixed_ips:
-        - ip_address:
-            get_input:
-            - app_data_v6_ips
-            - 2
         vm_image_name:
           get_input: app_image_name
         port_app_oam_0_port_name:
@@ -666,9 +661,9 @@ topology_template:
           vf_module_name:
             get_input: vf_module_name
         port_app_data_0_port_ip_requirements:
-        - ip_version: 6
+        - ip_version: 4
           ip_count_required:
-            is_required: true
+            is_required: false
           floating_ip_count_required:
             is_required: false
         port_app_internal_0_port_allowed_address_pairs:
@@ -834,11 +829,6 @@ topology_template:
             params:
               $vnf_name:
                 get_input: vnf_name
-        port_iox_oam_0_port_fixed_ips:
-        - ip_address:
-            get_input:
-            - iox_oam_ips
-            - 0
         compute_iox_name:
         - get_input:
           - iox_names
@@ -882,7 +872,7 @@ topology_template:
         port_iox_oam_0_port_ip_requirements:
         - ip_version: 4
           ip_count_required:
-            is_required: true
+            is_required: false
           floating_ip_count_required:
             is_required: false
         port_iox_data_0_port_network_role_tag: data
@@ -1097,7 +1087,7 @@ topology_template:
         port_app_oam_0_port_ip_requirements:
         - ip_version: 4
           ip_count_required:
-            is_required: true
+            is_required: false
           floating_ip_count_required:
             is_required: false
         port_app_internal_0_port_network:
@@ -1117,11 +1107,6 @@ topology_template:
             params:
               $vnf_name:
                 get_input: vnf_name
-        port_app_oam_0_port_fixed_ips:
-        - ip_address:
-            get_input:
-            - app_oam_ips
-            - 0
         port_app_data_0_port_replacement_policy:
         - AUTO
         compute_app_name:
@@ -1203,7 +1188,7 @@ topology_template:
         port_plt_oam_0_port_ip_requirements:
         - ip_version: 4
           ip_count_required:
-            is_required: true
+            is_required: false
           floating_ip_count_required:
             is_required: false
         port_plt_data_0_port_mac_requirements:
@@ -1246,11 +1231,6 @@ topology_template:
             is_required: false
           floating_ip_count_required:
             is_required: true
-        port_plt_oam_0_port_fixed_ips:
-        - ip_address:
-            get_input:
-            - plt_oam_ips
-            - 0
         port_plt_oam_0_port_network_role_tag: oam
         port_plt_internal_0_port_name:
         - str_replace:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_appServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_appServiceTemplate.yaml
index 815fcb5582..6b96a09918 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_appServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_appServiceTemplate.yaml
@@ -324,7 +324,9 @@ topology_template:
         subnetpoolid:
           get_input: port_app_oam_0_port_subnetpoolid
         fixed_ips:
-          get_input: port_app_oam_0_port_fixed_ips
+          get_input:
+          - port_app_oam_0_port_fixed_ips
+          - index_value
         name:
           get_input:
           - port_app_oam_0_port_name
@@ -366,7 +368,9 @@ topology_template:
         subnetpoolid:
           get_input: port_app_data_0_port_subnetpoolid
         fixed_ips:
-          get_input: port_app_data_0_port_fixed_ips
+          get_input:
+          - port_app_data_0_port_fixed_ips
+          - index_value
         name:
           get_input:
           - port_app_data_0_port_name
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_ioxServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_ioxServiceTemplate.yaml
index 1527056307..993bf81e24 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_ioxServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_ioxServiceTemplate.yaml
@@ -254,7 +254,9 @@ topology_template:
         subnetpoolid:
           get_input: port_iox_data_0_port_subnetpoolid
         fixed_ips:
-          get_input: port_iox_data_0_port_fixed_ips
+          get_input:
+          - port_iox_data_0_port_fixed_ips
+          - index_value
         name:
           get_input:
           - port_iox_data_0_port_name
@@ -329,7 +331,9 @@ topology_template:
         subnetpoolid:
           get_input: port_iox_oam_0_port_subnetpoolid
         fixed_ips:
-          get_input: port_iox_oam_0_port_fixed_ips
+          get_input:
+          - port_iox_oam_0_port_fixed_ips
+          - index_value
         name:
           get_input:
           - port_iox_oam_0_port_name
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_pltServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_pltServiceTemplate.yaml
index 1365084d4d..0b2fd5b0af 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_pltServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_pltServiceTemplate.yaml
@@ -296,7 +296,9 @@ topology_template:
         subnetpoolid:
           get_input: port_plt_data_0_port_subnetpoolid
         fixed_ips:
-          get_input: port_plt_data_0_port_fixed_ips
+          get_input:
+          - port_plt_data_0_port_fixed_ips
+          - index_value
         name:
           get_input:
           - port_plt_data_0_port_name
@@ -371,7 +373,9 @@ topology_template:
         subnetpoolid:
           get_input: port_plt_oam_0_port_subnetpoolid
         fixed_ips:
-          get_input: port_plt_oam_0_port_fixed_ips
+          get_input:
+          - port_plt_oam_0_port_fixed_ips
+          - index_value
         name:
           get_input:
           - port_plt_oam_0_port_name