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

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/MainServiceTemplate.yaml
index 28836651f6..14c0261606 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/MainServiceTemplate.yaml
@@ -323,6 +323,8 @@ topology_template:
       directives:
       - substitutable
       properties:
+        port_pd_server_port_0_network:
+        - get_input: oam_net_name
         compute_pd_server_availability_zone:
         - get_attribute:
           - abstract_pd_server_0
@@ -331,26 +333,24 @@ topology_template:
         - get_input:
           - pd_server_names
           - 2
+        port_pd_server_port_0_network_role_tag: oam
         vm_flavor_name:
           get_attribute:
           - network_policy_server
           - name
-        port_pd01_port_mac_requirements:
-          mac_count_required:
-            is_required: false
-        vm_image_name:
-          get_input: pd_image_name
-        port_pd01_port_ip_requirements:
+        port_pd_server_port_0_ip_requirements:
         - ip_version: 4
           ip_count_required:
             is_required: false
           floating_ip_count_required:
             is_required: false
-        port_pd01_port_network:
-        - get_input: oam_net_name
-        port_pd01_port_network_role_tag: oam
+        vm_image_name:
+          get_input: pd_image_name
         compute_pd_server_user_data_format:
         - RAW
+        port_pd_server_port_0_mac_requirements:
+          mac_count_required:
+            is_required: false
         service_template_filter:
           substitute_service_template: Nested_pd_serverServiceTemplate.yaml
           count: 1
@@ -369,32 +369,32 @@ topology_template:
       directives:
       - substitutable
       properties:
+        port_pd_server_port_0_network:
+        - get_input: oam_net_name
         compute_pd_server_availability_zone:
         - get_input: availabilityzone_name
         compute_pd_server_name:
         - get_input:
           - pd_server_names
           - 0
+        port_pd_server_port_0_network_role_tag: oam
         vm_flavor_name:
           get_attribute:
           - network_policy_server
           - name
-        port_pd01_port_mac_requirements:
-          mac_count_required:
-            is_required: false
-        vm_image_name:
-          get_input: pd_image_name
-        port_pd01_port_ip_requirements:
+        port_pd_server_port_0_ip_requirements:
         - ip_version: 4
           ip_count_required:
             is_required: false
           floating_ip_count_required:
             is_required: false
-        port_pd01_port_network:
-        - get_input: oam_net_name
-        port_pd01_port_network_role_tag: oam
+        vm_image_name:
+          get_input: pd_image_name
         compute_pd_server_user_data_format:
         - RAW
+        port_pd_server_port_0_mac_requirements:
+          mac_count_required:
+            is_required: false
         service_template_filter:
           substitute_service_template: Nested_pd_serverServiceTemplate.yaml
           count: 1
@@ -408,32 +408,32 @@ topology_template:
       directives:
       - substitutable
       properties:
+        port_pd_server_port_0_network:
+        - get_input: oam_net_name
         compute_pd_server_availability_zone:
         - get_input: availabilityzone_name
         compute_pd_server_name:
         - get_input:
           - pd_server_names
           - 1
+        port_pd_server_port_0_network_role_tag: oam
         vm_flavor_name:
           get_attribute:
           - network_policy_server
           - name
-        port_pd01_port_mac_requirements:
-          mac_count_required:
-            is_required: false
-        vm_image_name:
-          get_input: pd_image_name
-        port_pd01_port_ip_requirements:
+        port_pd_server_port_0_ip_requirements:
         - ip_version: 4
           ip_count_required:
             is_required: false
           floating_ip_count_required:
             is_required: false
-        port_pd01_port_network:
-        - get_input: oam_net_name
-        port_pd01_port_network_role_tag: oam
+        vm_image_name:
+          get_input: pd_image_name
         compute_pd_server_user_data_format:
         - RAW
+        port_pd_server_port_0_mac_requirements:
+          mac_count_required:
+            is_required: false
         service_template_filter:
           substitute_service_template: Nested_pd_serverServiceTemplate.yaml
           count: 1
@@ -452,4 +452,4 @@ topology_template:
       - network_policy_server
       - abstract_pd_server_0
       - abstract_pd_server_1
-      - abstract_pd_server_2
+      - abstract_pd_server_2
\ No newline at end of file