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

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/in/main.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/in/main.yml
index 1fa93606cc..4aef865a20 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/in/main.yml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/in/main.yml
@@ -52,7 +52,7 @@ resources:
       name:
         get_param: packet_externalmain_network_name
 
-  pd_server_1b_port_0:
+  pd_server_1b_1_port_1:
     type: OS::Neutron::Port
     properties:
       network: { get_resource: packet_internalmain_network }
@@ -66,14 +66,14 @@ resources:
       fixed_ips: [{"ip_address": {get_param: [pd_server_1b_ips, 1]}}]
       replacement_policy: AUTO
 
-  pd_server_1b_port_01:
+  pd_server_1b_2_port_1:
     type: OS::Neutron::Port
     properties:
       network: {get_resource: packet_internalmain_network}
       fixed_ips: [{"ip_address": {get_param: [pd_server_1b_ips, 0]}}]
       replacement_policy: AUTO
 
-  pd_server_1b_port_11:
+  pd_server_1b_3_port_1:
     type: OS::Neutron::Port
     properties:
       network: {get_resource: packet_internalmain_network}
@@ -88,7 +88,7 @@ resources:
       availability_zone: { get_param: availability_zone_0 }
       flavor: { get_param: pd_server_1b_flavor }
       networks:
-      - port: { get_resource: pd_server_1b_port_0 }
+      - port: { get_resource: pd_server_1b_1_port_1 }
 
   server_1b_pd_1:
     type: OS::Nova::Server
@@ -108,7 +108,7 @@ resources:
       availability_zone: { get_param: availability_zone_0 }
       flavor: { get_param: pd_server_1b_flavor }
       networks:
-      - port: { get_resource: pd_server_1b_port_01 }
+      - port: { get_resource: pd_server_1b_2_port_1 }
 
   server_1b_pd_11:
     type: OS::Nova::Server
@@ -118,7 +118,7 @@ resources:
       availability_zone: { get_param: availability_zone_0 }
       flavor: { get_param: pd_server_1b_flavor }
       networks:
-        - port: { get_resource: pd_server_1b_port_11 }
+        - port: { get_resource: pd_server_1b_3_port_1 }
 
   test_resourceGroup_0:
     type: OS::Heat::ResourceGroup
@@ -127,7 +127,7 @@ resources:
       resource_def:
         type: nested_vlan.yml
         properties:
-          parent_interface: { get_resource: pd_server_1b_port_0}
+          parent_interface: { get_resource: pd_server_1b_1_port_1}
           net1: { get_resource: packet_externalmain_network}
 
   test_resourceGroup_1:
@@ -147,7 +147,7 @@ resources:
       resource_def:
         type: nested_vlan.yml
         properties:
-          parent_interface: { get_resource: pd_server_1b_port_01}
+          parent_interface: { get_resource: pd_server_1b_2_port_1}
           net1: { get_resource: packet_externalmain_network}
 
   test_resourceGroup_11:
@@ -157,7 +157,7 @@ resources:
       resource_def:
         type: nested_vlan.yml
         properties:
-          parent_interface: { get_resource: pd_server_1b_port_11}
+          parent_interface: { get_resource: pd_server_1b_3_port_1}
           net1: { get_resource: packet_externalmain_network}
 
   test_nested_level1: