From aeb418d236199246784bbb5695fc779e48957bd8 Mon Sep 17 00:00:00 2001 From: Tal Gitelman Date: Sun, 24 Dec 2017 21:22:51 +0200 Subject: fix VM grouping ignoring fixed_ips value when consolidating VMs Issue-ID: SDC-774 Change-Id: Icdd88af94ff0609f6efabf69b00ed09836270fff Signed-off-by: talio --- .../out/Nested_1c1_scalling_instanceServiceTemplate.yaml | 8 ++++++-- .../out/Nested_pcma_serverServiceTemplate.yaml | 8 ++++++-- .../out/Nested_pcma_server_1ServiceTemplate.yaml | 8 ++++++-- 3 files changed, 18 insertions(+), 6 deletions(-) (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out') diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c1_scalling_instanceServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c1_scalling_instanceServiceTemplate.yaml index 045f907605..048b1411a8 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c1_scalling_instanceServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c1_scalling_instanceServiceTemplate.yaml @@ -151,7 +151,9 @@ topology_template: subnetpoolid: get_input: port_1c1_t1_port_subnetpoolid fixed_ips: - get_input: port_1c1_t1_port_fixed_ips + get_input: + - port_1c1_t1_port_fixed_ips + - index_value name: get_input: - port_1c1_t1_port_name @@ -208,7 +210,9 @@ topology_template: subnetpoolid: get_input: port_1c1_t2_port_subnetpoolid fixed_ips: - get_input: port_1c1_t2_port_fixed_ips + get_input: + - port_1c1_t2_port_fixed_ips + - index_value name: get_input: - port_1c1_t2_port_name diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_pcma_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_pcma_serverServiceTemplate.yaml index 87432d3911..b287b62a17 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_pcma_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_pcma_serverServiceTemplate.yaml @@ -187,7 +187,9 @@ topology_template: subnetpoolid: get_input: port_pcm_port_3_subnetpoolid fixed_ips: - get_input: port_pcm_port_3_fixed_ips + get_input: + - port_pcm_port_3_fixed_ips + - index_value network: get_input: - port_pcm_port_3_network @@ -221,7 +223,9 @@ topology_template: subnetpoolid: get_input: port_pcm_port_2_subnetpoolid fixed_ips: - get_input: port_pcm_port_2_fixed_ips + get_input: + - port_pcm_port_2_fixed_ips + - index_value network: get_input: - port_pcm_port_2_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_pcma_server_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_pcma_server_1ServiceTemplate.yaml index 4f927ee3a8..7cc130e234 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_pcma_server_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_pcma_server_1ServiceTemplate.yaml @@ -178,7 +178,9 @@ topology_template: subnetpoolid: get_input: port_pcm_port_0_subnetpoolid fixed_ips: - get_input: port_pcm_port_0_fixed_ips + get_input: + - port_pcm_port_0_fixed_ips + - index_value network: get_input: - port_pcm_port_0_network @@ -212,7 +214,9 @@ topology_template: subnetpoolid: get_input: port_pcm_port_1_subnetpoolid fixed_ips: - get_input: port_pcm_port_1_fixed_ips + get_input: + - port_pcm_port_1_fixed_ips + - index_value network: get_input: - port_pcm_port_1_network -- cgit 1.2.3-korg