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, 33 insertions, 33 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/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/MainServiceTemplate.yaml
index fa1596322b..e6cc52a094 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/MainServiceTemplate.yaml
@@ -137,29 +137,7 @@ topology_template:
         - 9
         - 9
         - 9
-        vm_flavor_name:
-          get_input: pd_server_1b_flavor
-        subinterface_nested_vlan_net1:
-        - packet_externalmain_network
-        - packet_externalmain_network
-        - packet_externalmain_network
-        - packet_externalmain_network
-        vm_image_name:
-          get_input: pd_server_1b_image
-        port_pd_server_1b_port_replacement_policy:
-        - AUTO
-        - AUTO
-        - AUTO
-        - AUTO
-        port_pd_server_1b_port_mac_requirements:
-          mac_count_required:
-            is_required: false
-        subinterface_nested_vlan_parent_interface:
-        - pd_server_1b_port_0
-        - pd_server_1b_port_01
-        - pd_server_1b_port_11
-        - pd_server_1b_port_1
-        port_pd_server_1b_port_fixed_ips:
+        port_pd_server_1b_port_1_fixed_ips:
         - - ip_address:
               get_input:
               - pd_server_1b_ips
@@ -176,22 +154,44 @@ topology_template:
               get_input:
               - pd_server_1b_ips
               - 1
-        port_pd_server_1b_port_network:
+        port_pd_server_1b_port_1_mac_requirements:
+          mac_count_required:
+            is_required: false
+        vm_flavor_name:
+          get_input: pd_server_1b_flavor
+        subinterface_nested_vlan_net1:
+        - packet_externalmain_network
+        - packet_externalmain_network
+        - packet_externalmain_network
+        - packet_externalmain_network
+        vm_image_name:
+          get_input: pd_server_1b_image
+        port_pd_server_1b_port_1_network:
         - packet_internalmain_network
         - packet_internalmain_network
         - packet_internalmain_network
         - packet_internalmain_network
-        compute_pd_server_1b_availability_zone:
-        - get_input: availability_zone_0
-        - get_input: availability_zone_0
-        - get_input: availability_zone_0
-        - get_input: availability_zone_0
-        port_pd_server_1b_port_ip_requirements:
+        subinterface_nested_vlan_parent_interface:
+        - pd_server_1b_1_port_1
+        - pd_server_1b_2_port_1
+        - pd_server_1b_3_port_1
+        - pd_server_1b_port_1
+        port_pd_server_1b_port_1_replacement_policy:
+        - AUTO
+        - AUTO
+        - AUTO
+        - AUTO
+        port_pd_server_1b_port_1_ip_requirements:
         - ip_version: 4
           ip_count_required:
             is_required: true
           floating_ip_count_required:
             is_required: false
+        compute_pd_server_1b_availability_zone:
+        - get_input: availability_zone_0
+        - get_input: availability_zone_0
+        - get_input: availability_zone_0
+        - get_input: availability_zone_0
         service_template_filter:
           substitute_service_template: Nested_pd_server_1b_1ServiceTemplate.yaml
           count: 4
@@ -201,11 +201,11 @@ topology_template:
           - service_template_filter
           - index_value
       requirements:
-      - link_pd_server_1b_pd_server_1b_port:
+      - link_pd_server_1b_pd_server_1b_port_1:
           capability: tosca.capabilities.network.Linkable
           node: packet_internalmain_network
           relationship: tosca.relationships.network.LinksTo
-      - subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan:
+      - subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_1_nested_vlan:
           capability: tosca.capabilities.network.Linkable
           node: packet_externalmain_network
           relationship: tosca.relationships.network.LinksTo
@@ -237,4 +237,4 @@ topology_template:
       - packet_internalmain_network
       - test_nested_level1
       - packet_externalmain_network
-      - abstract_pd_server_1b_1
\ No newline at end of file
+      - abstract_pd_server_1b_1