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

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/in/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/in/MainServiceTemplate.yaml
index d8a7a103fd..c99b60175a 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/in/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/in/MainServiceTemplate.yaml
@@ -106,7 +106,7 @@ topology_template:
       type: string
       description: prop
   node_templates:
-    FSB2_Internal_2:
+    FSB_1_Internal_port_0:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         network: Internal2-net
@@ -116,7 +116,7 @@ topology_template:
           capability: tosca.capabilities.network.Bindable
           node: FSB1_template
           relationship: tosca.relationships.network.BindsTo
-    FSB2_Internal_1:
+    FSB_2_Internal_port_0:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         mac_address:
@@ -126,12 +126,12 @@ topology_template:
           capability: tosca.capabilities.network.Bindable
           node: FSB2_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:
           get_input: fsb1-Internal1-mac
-        network: {get_attribute: [FSB2_Internal_1, att]}
+        network: {get_attribute: [FSB_2_Internal_port_0, att]}
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
@@ -141,12 +141,12 @@ topology_template:
           capability: tosca.capabilities.network.Linkable
           node: jsa_net1
           relationship: tosca.relationships.network.LinksTo
-    FSB1_Internal_2:
+    FSB_2_Internal_port_1:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         mac_address:
           get_input: fsb1-Internal1-mac
-        network: {get_attribute: [FSB2_Internal_1, att]}
+        network: {get_attribute: [FSB_2_Internal_port_0, att]}
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
@@ -162,7 +162,7 @@ topology_template:
         shared: true
         network_name:
          get_attribute:
-          - FSB1_Internal_1
+          - FSB_1_Internal_port_1
           - network_id
         dhcp_agent_ids:
          get_attribute:
@@ -170,11 +170,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
@@ -239,7 +239,7 @@ topology_template:
         availability_zone:
           get_input: fsb_zone
         name:
-          get_attribute: [FSB1_Internal_1, name]
+          get_attribute: [FSB_1_Internal_port_1, name]
       artifacts:
         nimbus-ethernet-gw:
           type: tosca.artifacts.Deployment
@@ -259,8 +259,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_Internal_2,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: [FSB_2_Internal_port_1,status ] }], 0, "OS-EXT-IPS-MAC:mac_addr"] }
     cmaui_volume2:
       type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume
       properties:
@@ -270,8 +270,8 @@ topology_template:
     cmaui_volume3:
       type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume
       properties:
-        volume_type: {get_attribute: [ FSB2_template, addresses, {get_attribute: [ FSB2_Internal_1,tenant_id ] } ]}
-        size: { get_attribute: [FSB1_Internal_2, device_owner, get_input: [CMAUI_volume_type,{get_attribute: [FSB2_template,status ] }], 0, "OS-EXT-IPS-MAC:mac_addr"] }
+        volume_type: {get_attribute: [ FSB2_template, addresses, {get_attribute: [ FSB_2_Internal_port_0,tenant_id ] } ]}
+        size: { get_attribute: [FSB_2_Internal_port_1, device_owner, get_input: [CMAUI_volume_type,{get_attribute: [FSB2_template,status ] }], 0, "OS-EXT-IPS-MAC:mac_addr"] }
   groups:
     ep-jsa_net_group:
       type: org.openecomp.groups.heat.HeatStack
@@ -280,9 +280,9 @@ topology_template:
         description: |
           Version 2.0 02-09-2016 (Authors: John Doe, user PROD)
       members:
-      - FSB2_Internal_2
-      - FSB2_Internal_1
-      - FSB1_Internal_1
-      - FSB1_Internal_2
+      - FSB_1_Internal_port_0
+      - FSB_2_Internal_port_0
+      - FSB_1_Internal_port_1
+      - FSB_2_Internal_port_1
       - FSB1_template
       - FSB2_template
\ No newline at end of file