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

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/in/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/in/MainServiceTemplate.yaml
index f80a76a708..5c1c77bb46 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/in/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/in/MainServiceTemplate.yaml
@@ -287,7 +287,7 @@ topology_template:
       type: string
       description: Internal1_external
   node_templates:
-    FSB2_Internal_2:
+    FSB_1_Internal_port_0:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         mac_address:
@@ -298,7 +298,7 @@ topology_template:
           capability: tosca.capabilities.network.Bindable
           node: FSB1_template
           relationship: tosca.relationships.network.BindsTo
-    FSB1_Internal_1:
+    FSB_1_Internal_port_1:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         mac_address:
@@ -335,7 +335,7 @@ topology_template:
         shared: true
         network_name:
          get_attribute:
-          - FSB1_Internal_1
+          - FSB_1_Internal_port_1
           - network_id
         dhcp_agent_ids:
          get_attribute:
@@ -343,11 +343,11 @@ topology_template:
           - addresses
         tenant_id:
          get_attribute:
-          - FSB2_Internal_2
+          - FSB_1_Internal_port_0
           - network_id
         qos_policy:
          get_attribute:
-          - FSB2_Internal_2
+          - FSB_1_Internal_port_0
           - network_id
     FSB1_template:
       type: org.openecomp.resource.vfc.nodes.heat.FSB1
@@ -355,11 +355,11 @@ topology_template:
         flavor:
           get_input: fsb1-flavor
         availability_zone:
-          get_attribute: [ FSB1_Internal_1, myAttr, get_attribute: [FSB1_Internal_1, index] ]
+          get_attribute: [ FSB_1_Internal_port_1, myAttr, get_attribute: [FSB_1_Internal_port_1, index] ]
         metadata:
-          get_attribute: [ FSB1_Internal_1, myAttr, get_input: index ]
+          get_attribute: [ FSB_1_Internal_port_1, myAttr, get_input: index ]
         name:
-          get_attribute: [ FSB1_Internal_1, myAttr, get_attribute: [jsa_net1, index] ]
+          get_attribute: [ FSB_1_Internal_port_1, myAttr, get_attribute: [jsa_net1, index] ]
       artifacts:
         nimbus-ethernet-gw:
           type: tosca.artifacts.Deployment
@@ -379,8 +379,8 @@ topology_template:
     cmaui_volume1:
       type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume
       properties:
-        volume_type: {get_attribute: [ FSB1_template, addresses, {get_attribute: [ FSB2_Internal_2,tenant_id ] } ]}
-        size: { get_attribute: [FSB1_Internal_1, device_owner, get_input: [CMAUI_volume_type,{get_attribute: [FSB1_OAM,status ] }], 0, "OS-EXT-IPS-MAC:mac_addr"] }
+        volume_type: {get_attribute: [ FSB1_template, addresses, {get_attribute: [ FSB_1_Internal_port_0,tenant_id ] } ]}
+        size: { get_attribute: [FSB_1_Internal_port_1, device_owner, get_input: [CMAUI_volume_type,{get_attribute: [FSB1_OAM,status ] }], 0, "OS-EXT-IPS-MAC:mac_addr"] }
     cmaui_volume2:
       type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume
       properties:
@@ -395,7 +395,7 @@ topology_template:
         description: |
           Version 2.0 02-09-2016 (Authors: John Doe, user PROD)
       members:
-      - FSB2_Internal_2
-      - FSB1_Internal_1
+      - FSB_1_Internal_port_0
+      - FSB_1_Internal_port_1
       - FSB1_OAM
       - FSB1_template
\ No newline at end of file