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

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/MainServiceTemplate.yaml
index 9e94e9736c..abdd106602 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/MainServiceTemplate.yaml
@@ -832,17 +832,6 @@ topology_template:
       directives:
       - substitutable
       properties:
-        port_pd01_port_0_mac_requirements:
-          mac_count_required:
-            is_required: false
-        port_pd01_port_0_network:
-        - get_input: oam_net_name
-        port_pd01_port_0_ip_requirements:
-        - ip_version: 4
-          ip_count_required:
-            is_required: false
-          floating_ip_count_required:
-            is_required: false
         compute_pd_server_availability_zone:
         - get_input: availabilityzone_name
         compute_pd_server_name:
@@ -851,21 +840,32 @@ topology_template:
           - 0
         vm_flavor_name:
           get_input: pd_flavor_name
+        port_pd_server_1_oam_port_0_mac_requirements:
+          mac_count_required:
+            is_required: false
         vm_image_name:
           get_input: pd_image_name
-        port_pd01_port_1_network_role_tag: oam
-        port_pd01_port_1_network:
-        - get_input: oam_net_name
+        port_pd_server_0_oam_port_0_network_role_tag: oam
         compute_pd_server_user_data_format:
         - RAW
-        port_pd01_port_0_network_role_tag: oam
-        port_pd01_port_1_ip_requirements:
+        port_pd_server_1_oam_port_0_network_role_tag: oam
+        port_pd_server_0_oam_port_0_ip_requirements:
+        - ip_version: 4
+          ip_count_required:
+            is_required: false
+          floating_ip_count_required:
+            is_required: false
+        port_pd_server_1_oam_port_0_network:
+        - get_input: oam_net_name
+        port_pd_server_0_oam_port_0_network:
+        - get_input: oam_net_name
+        port_pd_server_1_oam_port_0_ip_requirements:
         - ip_version: 4
           ip_count_required:
             is_required: false
           floating_ip_count_required:
             is_required: false
-        port_pd01_port_1_mac_requirements:
+        port_pd_server_0_oam_port_0_mac_requirements:
           mac_count_required:
             is_required: false
         service_template_filter:
@@ -890,16 +890,16 @@ topology_template:
       value:
         get_attribute:
         - abstract_pd_server
-        - pd_server_pd01_port_1_device_owner
+        - pd_server_pd_server_1_oam_port_0_device_owner
     out3:
       description: output_regula
       value:
         get_attribute:
         - abstract_pd_server
-        - pd_server_pd01_port_0_device_id
+        - pd_server_pd_server_0_oam_port_0_device_id
     out1:
       description: output_regula
       value:
         get_attribute:
         - abstract_pd_server
-        - pd_server_accessIPv4
\ No newline at end of file
+        - pd_server_accessIPv4