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/singleSubstitution/threeDiffComputesWithAllConnectivities/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/singleSubstitution/threeDiffComputesWithAllConnectivities/in/hot-mog-0108-bs1271.yml
index ebdece7be3..1f09bbd0cd 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/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/singleSubstitution/threeDiffComputesWithAllConnectivities/in/hot-mog-0108-bs1271.yml
@@ -104,7 +104,7 @@ resources:
       scheduler_hints: { group: { get_resource: BE_Affinity }}
       block_device_mapping: [{device_name: "vda", volume_id : {get_param: VMME_ps_boot_volume }, delete_on_termination: "false" }]
       networks:
-        - port: {get_resource: pd01_port_0}
+        - port: {get_resource: ps_server_0_oam_port_0}
       user_data_format:  RAW
 
   server_pd_01:
@@ -120,7 +120,7 @@ resources:
       scheduler_hints: { group: { get_resource: BE_Affinity }}
       block_device_mapping: [{device_name: "vda", volume_id : {get_param: VMME_pd_boot_volume }, delete_on_termination: "false" }]
       networks:
-        - port: {get_resource: pd01_port_1}
+        - port: {get_resource: pd_server_0_oam_port_0}
       user_data_format:  RAW
 
   server_oam_01:
@@ -136,22 +136,22 @@ resources:
       scheduler_hints: { group: { get_resource: BE_Affinity }}
       block_device_mapping: [{device_name: "vda", volume_id : {get_param: VMME_oam_boot_volume }, delete_on_termination: "false" }]
       networks:
-        - port: {get_resource: pd01_port_2}
+        - port: {get_resource: oam_server_0_oam_port_0}
       user_data_format:  RAW
 
-  pd01_port_0:
+  ps_server_0_oam_port_0:
     type: OS::Neutron::Port
     properties:
       network: {get_attr: [network_policy_server, name]}
       security_groups: [{get_resource: jsa_security_group}]
 
-  pd01_port_1:
+  pd_server_0_oam_port_0:
     type: OS::Neutron::Port
     properties:
       network: {get_param: oam_net_name}
       security_groups: [{get_resource: jsa_security_group}]
 
-  pd01_port_2:
+  oam_server_0_oam_port_0:
     type: OS::Neutron::Port
     properties:
       network: {get_param: oam_net_name}
@@ -216,9 +216,9 @@ outputs:
       value: {get_attr: [server_oam_01, accessIPv4]}
   out4:
       description: output_regula
-      value: {get_attr: [pd01_port_1, device_owner]}
+      value: {get_attr: [pd_server_0_oam_port_0, device_owner]}
   out5:
       description: output_regula
       value:
-        get_attr: [pd01_port_0, device_id]
+        get_attr: [ps_server_0_oam_port_0, device_id]