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

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/MainServiceTemplate.yaml
index e71657f3c9..88088e4d67 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/MainServiceTemplate.yaml
@@ -432,10 +432,18 @@ topology_template:
         - get_input: availability_zone_1
         subinterface_nested2_aap_untrusted_v6_ip_prefix:
         - get_input: vdbe_aap_untrusted_v6_ip_prefix
+        port_vdbe_untr_port_1_name:
+        - str_replace:
+            template: VM_NAMEDBE001p1n004
+            params:
+              DBE:
+                get_input: vdbe_device_name
+              VM_NAME:
+                get_input: vdbe_name_1
         vm_flavor_name:
           get_input: vdbe_flavor_name
         subinterface_nested2_parent_interface:
-        - vdbe_2_untr_port_2
+        - vdbe_2_untr_port_1
         subinterface_nested2_aap_sec_untrusted_ip_prefix:
         - get_input: vdbe_aap_sec_untrusted_ip_prefix
         subinterface_nested2_vmac_address:
@@ -453,19 +461,17 @@ topology_template:
         - get_input: vdbe_aap_sec_untrusted_ip_prefix_len
         subinterface_nested2_mac_address:
         - get_input: vdbe_hw_untr_mac_1
-        port_vdbe_untr_port_mac_requirements:
+        port_vdbe_untr_port_1_ip_requirements:
+        - ip_version: 4
+          ip_count_required:
+            is_required: false
+          floating_ip_count_required:
+            is_required: false
+        port_vdbe_untr_port_1_mac_requirements:
           mac_count_required:
             is_required: false
         subinterface_nested2_ip_address:
         - get_input: vdbe_untrusted_ip_1
-        port_vdbe_untr_port_name:
-        - str_replace:
-            template: VM_NAMEDBE001p1n004
-            params:
-              DBE:
-                get_input: vdbe_device_name
-              VM_NAME:
-                get_input: vdbe_name_1
         subinterface_nested2_vlan_tag_list:
         - get_input: untrusted_vlan_tags
         subinterface_nested2_aap_untrusted_ip_prefix_len:
@@ -486,12 +492,6 @@ topology_template:
         - get_input: aap_address_mode
         subinterface_nested2_vn_network_list:
         - get_input: untrusted_vn_networks
-        port_vdbe_untr_port_ip_requirements:
-        - ip_version: 4
-          ip_count_required:
-            is_required: false
-          floating_ip_count_required:
-            is_required: false
         service_template_filter:
           substitute_service_template: Nested_vdbe_1ServiceTemplate.yaml
           count: 1
@@ -513,6 +513,14 @@ topology_template:
         - get_input: untrusted_vn_networks
         compute_vdbe_availability_zone:
         - get_input: availability_zone_1
+        port_vdbe_untr_port_1_name:
+        - str_replace:
+            template: VM_NAMEDBE001p1n004
+            params:
+              DBE:
+                get_input: vdbe_device_name
+              VM_NAME:
+                get_input: vdbe_name_1
         vm_flavor_name:
           get_input: vdbe_flavor_name
         vm_image_name:
@@ -546,17 +554,15 @@ topology_template:
         - get_input: vdbe_aap_untrusted_ip_prefix_len
         subinterface_nested1_ip_v6_address:
         - get_input: vdbe_untrusted_v6_ip_1
-        port_vdbe_untr_port_mac_requirements:
+        port_vdbe_untr_port_1_ip_requirements:
+        - ip_version: 4
+          ip_count_required:
+            is_required: false
+          floating_ip_count_required:
+            is_required: false
+        port_vdbe_untr_port_1_mac_requirements:
           mac_count_required:
             is_required: false
-        port_vdbe_untr_port_name:
-        - str_replace:
-            template: VM_NAMEDBE001p1n004
-            params:
-              DBE:
-                get_input: vdbe_device_name
-              VM_NAME:
-                get_input: vdbe_name_1
         subinterface_nested1_mac_address:
         - get_input: vdbe_hw_untr_mac_1
         subinterface_nested1_aap_untrusted_ip_prefix:
@@ -569,12 +575,6 @@ topology_template:
         - get_input: vdbe_name_1
         subinterface_nested1_aap_sec_untrusted_ip_prefix:
         - get_input: vdbe_aap_sec_untrusted_ip_prefix
-        port_vdbe_untr_port_ip_requirements:
-        - ip_version: 4
-          ip_count_required:
-            is_required: false
-          floating_ip_count_required:
-            is_required: false
         service_template_filter:
           substitute_service_template: Nested_vdbeServiceTemplate.yaml
           count: 1