From 6ce1094d509195fe484761467a67a6b3757593b0 Mon Sep 17 00:00:00 2001 From: ojasdubey Date: Thu, 29 Nov 2018 20:46:49 +0530 Subject: Fix - Port type and vmtype underscore issue 1. Fix for consolidation of VMs for cases when: a. VM type contains an underscore b. Multiple ports per network role 2. Updated the unit test cases and test data Change-Id: I875f3c8384f8ef2c2aa6add9e30a5f8899ae1a71 Issue-ID: SDC-1966 Signed-off-by: ojasdubey --- .../nestedMultiLevels/out/Nested_cmaui_2ServiceTemplate.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to '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') 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 63942e2108..97bc0655d1 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 @@ -90,10 +90,10 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_cmaui_port_1_exCP_naming: + port_cmaui_port_2_exCP_naming: type: org.openecomp.datatypes.Naming required: true - port_cmaui_port_2_exCP_naming: + port_cmaui_port_1_exCP_naming: type: org.openecomp.datatypes.Naming required: true port_cmaui_port_1_vlan_requirements: @@ -458,4 +458,4 @@ topology_template: - local_storage dependency_cmaui_cmaui_port_1: - cmaui_cmaui_port_1 - - dependency \ No newline at end of file + - dependency -- cgit 1.2.3-korg