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>

15 files changed, 105 insertions, 35 deletions

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cdiServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cdiServiceTemplate.yaml
index fc9676cc7a..4f2606ad61 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cdiServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cdiServiceTemplate.yaml
@@ -187,7 +187,9 @@ topology_template:
         subnetpoolid:
           get_input: port_cdi_ims_core_0_port_subnetpoolid
         fixed_ips:
-          get_input: port_cdi_ims_core_0_port_fixed_ips
+          get_input:
+          - port_cdi_ims_core_0_port_fixed_ips
+          - index_value
         name:
           get_input:
           - port_cdi_ims_core_0_port_name
@@ -258,7 +260,9 @@ topology_template:
         subnetpoolid:
           get_input: port_cdi_internal_0_port_subnetpoolid
         fixed_ips:
-          get_input: port_cdi_internal_0_port_fixed_ips
+          get_input:
+          - port_cdi_internal_0_port_fixed_ips
+          - index_value
         name:
           get_input:
           - port_cdi_internal_0_port_name
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cdi_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cdi_1ServiceTemplate.yaml
index b543f90372..ab2fb23db2 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cdi_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cdi_1ServiceTemplate.yaml
@@ -187,7 +187,9 @@ topology_template:
         subnetpoolid:
           get_input: port_cdi_internal_1_port_subnetpoolid
         fixed_ips:
-          get_input: port_cdi_internal_1_port_fixed_ips
+          get_input:
+          - port_cdi_internal_1_port_fixed_ips
+          - index_value
         name:
           get_input:
           - port_cdi_internal_1_port_name
@@ -258,7 +260,9 @@ topology_template:
         subnetpoolid:
           get_input: port_cdi_ims_core_1_port_subnetpoolid
         fixed_ips:
-          get_input: port_cdi_ims_core_1_port_fixed_ips
+          get_input:
+          - port_cdi_ims_core_1_port_fixed_ips
+          - index_value
         name:
           get_input:
           - port_cdi_ims_core_1_port_name
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cifServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cifServiceTemplate.yaml
index 3c3da4e997..d413c1ff9a 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cifServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cifServiceTemplate.yaml
@@ -377,7 +377,9 @@ topology_template:
         subnetpoolid:
           get_input: port_cif_internal_0_port_subnetpoolid
         fixed_ips:
-          get_input: port_cif_internal_0_port_fixed_ips
+          get_input:
+          - port_cif_internal_0_port_fixed_ips
+          - index_value
         name:
           get_input:
           - port_cif_internal_0_port_name
@@ -417,7 +419,9 @@ topology_template:
         subnetpoolid:
           get_input: port_cif_ims_li_0_port_subnetpoolid
         fixed_ips:
-          get_input: port_cif_ims_li_0_port_fixed_ips
+          get_input:
+          - port_cif_ims_li_0_port_fixed_ips
+          - index_value
         name:
           get_input:
           - port_cif_ims_li_0_port_name
@@ -457,7 +461,9 @@ topology_template:
         subnetpoolid:
           get_input: port_cif_ims_core_0_port_subnetpoolid
         fixed_ips:
-          get_input: port_cif_ims_core_0_port_fixed_ips
+          get_input:
+          - port_cif_ims_core_0_port_fixed_ips
+          - index_value
         name:
           get_input:
           - port_cif_ims_core_0_port_name
@@ -497,7 +503,9 @@ topology_template:
         subnetpoolid:
           get_input: port_cif_oam_0_port_1_subnetpoolid
         fixed_ips:
-          get_input: port_cif_oam_0_port_1_fixed_ips
+          get_input:
+          - port_cif_oam_0_port_1_fixed_ips
+          - index_value
         name:
           get_input:
           - port_cif_oam_0_port_1_name
@@ -537,7 +545,9 @@ topology_template:
         subnetpoolid:
           get_input: port_cif_oam_0_port_3_subnetpoolid
         fixed_ips:
-          get_input: port_cif_oam_0_port_3_fixed_ips
+          get_input:
+          - port_cif_oam_0_port_3_fixed_ips
+          - index_value
         name:
           get_input:
           - port_cif_oam_0_port_3_name
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cif_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cif_1ServiceTemplate.yaml
index f1e5cf1023..380440f67c 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cif_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cif_1ServiceTemplate.yaml
@@ -377,7 +377,9 @@ topology_template:
         subnetpoolid:
           get_input: port_cif_ims_li_1_port_subnetpoolid
         fixed_ips:
-          get_input: port_cif_ims_li_1_port_fixed_ips
+          get_input:
+          - port_cif_ims_li_1_port_fixed_ips
+          - index_value
         name:
           get_input:
           - port_cif_ims_li_1_port_name
@@ -417,7 +419,9 @@ topology_template:
         subnetpoolid:
           get_input: port_cif_internal_1_port_subnetpoolid
         fixed_ips:
-          get_input: port_cif_internal_1_port_fixed_ips
+          get_input:
+          - port_cif_internal_1_port_fixed_ips
+          - index_value
         name:
           get_input:
           - port_cif_internal_1_port_name
@@ -457,7 +461,9 @@ topology_template:
         subnetpoolid:
           get_input: port_cif_oam_1_port_1_subnetpoolid
         fixed_ips:
-          get_input: port_cif_oam_1_port_1_fixed_ips
+          get_input:
+          - port_cif_oam_1_port_1_fixed_ips
+          - index_value
         name:
           get_input:
           - port_cif_oam_1_port_1_name
@@ -497,7 +503,9 @@ topology_template:
         subnetpoolid:
           get_input: port_cif_ims_core_1_port_subnetpoolid
         fixed_ips:
-          get_input: port_cif_ims_core_1_port_fixed_ips
+          get_input:
+          - port_cif_ims_core_1_port_fixed_ips
+          - index_value
         name:
           get_input:
           - port_cif_ims_core_1_port_name
@@ -537,7 +545,9 @@ topology_template:
         subnetpoolid:
           get_input: port_cif_oam_1_port_3_subnetpoolid
         fixed_ips:
-          get_input: port_cif_oam_1_port_3_fixed_ips
+          get_input:
+          - port_cif_oam_1_port_3_fixed_ips
+          - index_value
         name:
           get_input:
           - port_cif_oam_1_port_3_name
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_lbdServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_lbdServiceTemplate.yaml
index a2c4af5daf..4e544f5c9c 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_lbdServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_lbdServiceTemplate.yaml
@@ -235,7 +235,9 @@ topology_template:
         subnetpoolid:
           get_input: port_lbd_ims_core_1_port_subnetpoolid
         fixed_ips:
-          get_input: port_lbd_ims_core_1_port_fixed_ips
+          get_input:
+          - port_lbd_ims_core_1_port_fixed_ips
+          - index_value
         name:
           get_input:
           - port_lbd_ims_core_1_port_name
@@ -275,7 +277,9 @@ topology_template:
         subnetpoolid:
           get_input: port_lbd_dpdk_1_port_subnetpoolid
         fixed_ips:
-          get_input: port_lbd_dpdk_1_port_fixed_ips
+          get_input:
+          - port_lbd_dpdk_1_port_fixed_ips
+          - index_value
         name:
           get_input:
           - port_lbd_dpdk_1_port_name
@@ -311,7 +315,9 @@ topology_template:
         network_role:
           get_input: port_lbd_internal_1_port_network_role
         fixed_ips:
-          get_input: port_lbd_internal_1_port_fixed_ips
+          get_input:
+          - port_lbd_internal_1_port_fixed_ips
+          - index_value
         subnetpoolid:
           get_input: port_lbd_internal_1_port_subnetpoolid
         name:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_lbd_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_lbd_1ServiceTemplate.yaml
index 64e5bdd8eb..86141e1fb2 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_lbd_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_lbd_1ServiceTemplate.yaml
@@ -235,7 +235,9 @@ topology_template:
         subnetpoolid:
           get_input: port_lbd_ims_core_0_port_subnetpoolid
         fixed_ips:
-          get_input: port_lbd_ims_core_0_port_fixed_ips
+          get_input:
+          - port_lbd_ims_core_0_port_fixed_ips
+          - index_value
         name:
           get_input:
           - port_lbd_ims_core_0_port_name
@@ -275,7 +277,9 @@ topology_template:
         subnetpoolid:
           get_input: port_lbd_dpdk_0_port_subnetpoolid
         fixed_ips:
-          get_input: port_lbd_dpdk_0_port_fixed_ips
+          get_input:
+          - port_lbd_dpdk_0_port_fixed_ips
+          - index_value
         name:
           get_input:
           - port_lbd_dpdk_0_port_name
@@ -311,7 +315,9 @@ topology_template:
         network_role:
           get_input: port_lbd_internal_0_port_network_role
         fixed_ips:
-          get_input: port_lbd_internal_0_port_fixed_ips
+          get_input:
+          - port_lbd_internal_0_port_fixed_ips
+          - index_value
         subnetpoolid:
           get_input: port_lbd_internal_0_port_subnetpoolid
         name:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_oamServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_oamServiceTemplate.yaml
index ec7944d0f8..0925522b81 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_oamServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_oamServiceTemplate.yaml
@@ -187,7 +187,9 @@ topology_template:
         subnetpoolid:
           get_input: port_oam_oam_0_port_subnetpoolid
         fixed_ips:
-          get_input: port_oam_oam_0_port_fixed_ips
+          get_input:
+          - port_oam_oam_0_port_fixed_ips
+          - index_value
         name:
           get_input:
           - port_oam_oam_0_port_name
@@ -227,7 +229,9 @@ topology_template:
         subnetpoolid:
           get_input: port_oam_internal_0_port_subnetpoolid
         fixed_ips:
-          get_input: port_oam_internal_0_port_fixed_ips
+          get_input:
+          - port_oam_internal_0_port_fixed_ips
+          - index_value
         name:
           get_input:
           - port_oam_internal_0_port_name
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_oam_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_oam_1ServiceTemplate.yaml
index f9da32d654..44fd3f4e6c 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_oam_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_oam_1ServiceTemplate.yaml
@@ -187,7 +187,9 @@ topology_template:
         subnetpoolid:
           get_input: port_oam_internal_1_port_subnetpoolid
         fixed_ips:
-          get_input: port_oam_internal_1_port_fixed_ips
+          get_input:
+          - port_oam_internal_1_port_fixed_ips
+          - index_value
         name:
           get_input:
           - port_oam_internal_1_port_name
@@ -227,7 +229,9 @@ topology_template:
         subnetpoolid:
           get_input: port_oam_oam_1_port_subnetpoolid
         fixed_ips:
-          get_input: port_oam_oam_1_port_fixed_ips
+          get_input:
+          - port_oam_oam_1_port_fixed_ips
+          - index_value
         name:
           get_input:
           - port_oam_oam_1_port_name
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_oam_2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_oam_2ServiceTemplate.yaml
index 21a53aedc7..d5e960758c 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_oam_2ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_oam_2ServiceTemplate.yaml
@@ -187,7 +187,9 @@ topology_template:
         subnetpoolid:
           get_input: port_oam_internal_2_port_subnetpoolid
         fixed_ips:
-          get_input: port_oam_internal_2_port_fixed_ips
+          get_input:
+          - port_oam_internal_2_port_fixed_ips
+          - index_value
         name:
           get_input:
           - port_oam_internal_2_port_name
@@ -227,7 +229,9 @@ topology_template:
         subnetpoolid:
           get_input: port_oam_oam_2_port_subnetpoolid
         fixed_ips:
-          get_input: port_oam_oam_2_port_fixed_ips
+          get_input:
+          - port_oam_oam_2_port_fixed_ips
+          - index_value
         name:
           get_input:
           - port_oam_oam_2_port_name
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/Nested_cmauiServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/Nested_cmauiServiceTemplate.yaml
index c73e74aaca..c457e4de3d 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/Nested_cmauiServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/Nested_cmauiServiceTemplate.yaml
@@ -157,7 +157,9 @@ topology_template:
         network_role:
           get_input: port_cmaui_port_5_network_role
         fixed_ips:
-          get_input: port_cmaui_port_5_fixed_ips
+          get_input:
+          - port_cmaui_port_5_fixed_ips
+          - index_value
         subnetpoolid:
           get_input: port_cmaui_port_5_subnetpoolid
         network:
@@ -195,7 +197,9 @@ topology_template:
         network_role:
           get_input: port_cmaui_port_6_network_role
         fixed_ips:
-          get_input: port_cmaui_port_6_fixed_ips
+          get_input:
+          - port_cmaui_port_6_fixed_ips
+          - index_value
         subnetpoolid:
           get_input: port_cmaui_port_6_subnetpoolid
         network:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/Nested_cmaui_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/Nested_cmaui_1ServiceTemplate.yaml
index cea4ae985c..88e7795e76 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/Nested_cmaui_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/Nested_cmaui_1ServiceTemplate.yaml
@@ -157,7 +157,9 @@ topology_template:
         network_role:
           get_input: port_cmaui_port_4_network_role
         fixed_ips:
-          get_input: port_cmaui_port_4_fixed_ips
+          get_input:
+          - port_cmaui_port_4_fixed_ips
+          - index_value
         subnetpoolid:
           get_input: port_cmaui_port_4_subnetpoolid
         network:
@@ -195,7 +197,9 @@ topology_template:
         network_role:
           get_input: port_cmaui_port_3_network_role
         fixed_ips:
-          get_input: port_cmaui_port_3_fixed_ips
+          get_input:
+          - port_cmaui_port_3_fixed_ips
+          - index_value
         subnetpoolid:
           get_input: port_cmaui_port_3_subnetpoolid
         network:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/Nested_cmaui_2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/Nested_cmaui_2ServiceTemplate.yaml
index 3c0a520290..2b0f9eec43 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/Nested_cmaui_2ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/Nested_cmaui_2ServiceTemplate.yaml
@@ -157,7 +157,9 @@ topology_template:
         network_role:
           get_input: port_cmaui_port_1_network_role
         fixed_ips:
-          get_input: port_cmaui_port_1_fixed_ips
+          get_input:
+          - port_cmaui_port_1_fixed_ips
+          - index_value
         subnetpoolid:
           get_input: port_cmaui_port_1_subnetpoolid
         network:
@@ -195,7 +197,9 @@ topology_template:
         network_role:
           get_input: port_cmaui_port_2_network_role
         fixed_ips:
-          get_input: port_cmaui_port_2_fixed_ips
+          get_input:
+          - port_cmaui_port_2_fixed_ips
+          - index_value
         subnetpoolid:
           get_input: port_cmaui_port_2_subnetpoolid
         network:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoComputesOfSameType/out/Nested_pcm_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoComputesOfSameType/out/Nested_pcm_serverServiceTemplate.yaml
index 4252b6221d..0db0a41bd7 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoComputesOfSameType/out/Nested_pcm_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoComputesOfSameType/out/Nested_pcm_serverServiceTemplate.yaml
@@ -135,7 +135,9 @@ topology_template:
         subnetpoolid:
           get_input: port_pcm_port_subnetpoolid
         fixed_ips:
-          get_input: port_pcm_port_fixed_ips
+          get_input:
+          - port_pcm_port_fixed_ips
+          - index_value
         network:
           get_input:
           - port_pcm_port_network
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/Nested_pcm_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/Nested_pcm_serverServiceTemplate.yaml
index 4252b6221d..0db0a41bd7 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/Nested_pcm_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/Nested_pcm_serverServiceTemplate.yaml
@@ -135,7 +135,9 @@ topology_template:
         subnetpoolid:
           get_input: port_pcm_port_subnetpoolid
         fixed_ips:
-          get_input: port_pcm_port_fixed_ips
+          get_input:
+          - port_pcm_port_fixed_ips
+          - index_value
         network:
           get_input:
           - port_pcm_port_network
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/Nested_pd_serverServiceTemplate.yaml
index 8d5b37f4cb..8b9d88dd85 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/Nested_pd_serverServiceTemplate.yaml
@@ -135,7 +135,9 @@ topology_template:
         subnetpoolid:
           get_input: port_pcm_port_subnetpoolid
         fixed_ips:
-          get_input: port_pcm_port_fixed_ips
+          get_input:
+          - port_pcm_port_fixed_ips
+          - index_value
         network:
           get_input:
           - port_pcm_port_network