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/scalingInstances/twoComputeTypesOnePort/in/hot-mog-0108-bs1271.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/in/hot-mog-0108-bs1271.yml
index 8d21459478..6133829189 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/in/hot-mog-0108-bs1271.yml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/in/hot-mog-0108-bs1271.yml
@@ -42,7 +42,7 @@ resources:
       flavor: {get_param: pd_flavor_name}
       availability_zone: {get_param: availabilityzone_name}
       networks:
-        - port: {get_resource: pd01_port_0}
+        - port: {get_resource: pd_server_0_mgmt_port_0}
       user_data_format:  RAW
   server_pd_02:
     type: OS::Nova::Server
@@ -52,7 +52,7 @@ resources:
       flavor: {get_param: pd_flavor_name}
       availability_zone: {get_param: availabilityzone_name}
       networks:
-        - port: {get_resource: pd01_port_1}
+        - port: {get_resource: pd_server_1_mgmt_port_0}
   server_ps_01:
     type: OS::Nova::Server
     properties:
@@ -61,7 +61,7 @@ resources:
       flavor: {get_param: ps_flavor_name}
       availability_zone: {get_param: availabilityzone_name}
       networks:
-        - port: {get_resource: ps01_port_0}
+        - port: {get_resource: ps_server_0_mgmt_port_0}
   server_ps_02:
     type: OS::Nova::Server
     properties:
@@ -70,24 +70,24 @@ resources:
       flavor: {get_param: ps_flavor_name}
       availability_zone: {get_param: availabilityzone_name}
       networks:
-        - port: {get_resource: ps01_port_1}
+        - port: {get_resource: ps_server_1_mgmt_port_0}
       user_data_format:  RAW
-  pd01_port_0:
+  pd_server_0_mgmt_port_0:
     type: OS::Neutron::Port
     properties:
       network: Network-PD-0
       replacement_policy: AUTO
-  pd01_port_1:
+  pd_server_1_mgmt_port_0:
     type: OS::Neutron::Port
     properties:
       network: Network-PD-1
       replacement_policy: AUTO
-  ps01_port_0:
+  ps_server_0_mgmt_port_0:
     type: OS::Neutron::Port
     properties:
       network: Network-PS-0
       replacement_policy: AUTO
-  ps01_port_1:
+  ps_server_1_mgmt_port_0:
     type: OS::Neutron::Port
     properties:
       network: Network-PS-1