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, 8 insertions, 8 deletions

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/in/nested1.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/in/nested1.yml
index 065355486c..5780c76f91 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/in/nested1.yml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/in/nested1.yml
@@ -100,14 +100,14 @@ resources:
       networks:
       - port: { get_resource: ps_server_1b_port }
       
-  cmaui_port_1:
+  cmaui_1c1_1_mgmt_port_0:
     type: OS::Neutron::Port
     properties:
       network: {get_resource: packet_internal_network}
       fixed_ips: [{"ip_address": {get_param: [cmaui_oam_ips, 0]}}]
       replacement_policy: AUTO
 
-  cmaui_port_2:
+  cmaui_1c1_2_mgmt_port_0:
     type: OS::Neutron::Port
     properties:
       network: {get_resource: packet_internal_network}
@@ -122,7 +122,7 @@ resources:
       availability_zone: { get_param: availability_zone_0 }
       flavor: { get_param: cmaui_1c1_flavor }
       networks:
-      - port: { get_resource: cmaui_port_1 }
+      - port: { get_resource: cmaui_1c1_1_mgmt_port_0 }
 
   server_1c1_cmaui_2:
     type: OS::Nova::Server
@@ -132,16 +132,16 @@ resources:
       availability_zone: { get_param: availability_zone_0 }
       flavor: { get_param: cmaui_1c1_flavor }
       networks:
-      - port: { get_resource: cmaui_port_2 }
+      - port: { get_resource: cmaui_1c1_2_mgmt_port_0 }
 
-  oam_port_1:
+  oam_server_1c2_1_mgmt_port_0:
     type: OS::Neutron::Port
     properties:
       network: {get_resource: packet_internal_network}
       fixed_ips: [{"ip_address": {get_param: [cmaui_oam_ips, 1]}}]
       replacement_policy: AUTO
 
-  oam_port_2:
+  oam_server_1c2_2_mgmt_port_0:
     type: OS::Neutron::Port
     properties:
       network: {get_resource: packet_external_network}
@@ -156,7 +156,7 @@ resources:
       availability_zone: { get_param: availability_zone_0 }
       flavor: { get_param: oam_server_1c2_flavor }
       networks:
-      - port: { get_resource: oam_port_1 }
+      - port: { get_resource: oam_server_1c2_1_mgmt_port_0 }
 
   server_1c2_oam_2:
     type: OS::Nova::Server
@@ -166,7 +166,7 @@ resources:
       availability_zone: { get_param: availability_zone_0 }
       flavor: { get_param: oam_server_1c2_flavor }
       networks:
-      - port: { get_resource: oam_port_2 }
+      - port: { get_resource: oam_server_1c2_2_mgmt_port_0 }
 
   packet_internal_network:
     type: OS::Neutron::Net