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 <ojas.dubey@amdocs.com>

1 files changed, 4 insertions, 4 deletions

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedScalingInstance/in/nested1.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedScalingInstance/in/nested1.yml
index ae31f072a5..586a1fae71 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedScalingInstance/in/nested1.yml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedScalingInstance/in/nested1.yml
@@ -31,14 +31,14 @@ parameters:
     type: string
 resources:
 
-  cmaui_port_1:
+  cmaui_1_mgmt_port_0:
     type: OS::Neutron::Port
     properties:
       network: { get_param: net }
       fixed_ips: [{"ip_address": {get_param: [cmaui_oam_ips, 0]}}]
       replacement_policy: AUTO
 
-  cmaui_port_2:
+  cmaui_2_mgmt_port_0:
     type: OS::Neutron::Port
     properties:
       network: { get_param: net }
@@ -53,7 +53,7 @@ resources:
       availability_zone: { get_param: availability_zone_0 }
       flavor: { get_param: cmaui_flavor }
       networks:
-      - port: { get_resource: cmaui_port_1 }
+      - port: { get_resource: cmaui_1_mgmt_port_0 }
 
   server_cmaui_2:
     type: OS::Nova::Server
@@ -63,6 +63,6 @@ resources:
       availability_zone: { get_param: availability_zone_0 }
       flavor: { get_param: cmaui_flavor }
       networks:
-      - port: { get_resource: cmaui_port_2 }
+      - port: { get_resource: cmaui_2_mgmt_port_0 }