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

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/out/SubstitutionServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/out/SubstitutionServiceTemplate.yaml
index 99e7fd0762..0739631901 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/out/SubstitutionServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/out/SubstitutionServiceTemplate.yaml
@@ -11,21 +11,13 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
-    port_FSB1_Internal_mac_address:
-      type: string
-      required: true
-    port_FSB1_Internal_ip_requirements:
-      type: list
-      required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.IpRequirements
-    port_FSB2_Internal_related_networks:
+    port_FSB_Internal_port_1_related_networks:
       type: list
       required: true
       entry_schema:
         type: org.openecomp.datatypes.network.RelatedNetworksAssignments
-    port_FSB1_Internal_subnetpoolid:
-      type: string
+    port_FSB_Internal_port_1_order:
+      type: integer
       required: true
     port_FSB1_OAM_subnetpoolid:
       type: string
@@ -35,69 +27,66 @@ topology_template:
       required: true
       entry_schema:
         type: json
-    port_FSB2_Internal_vlan_requirements:
+    port_FSB_Internal_port_1_network_role:
+      type: string
+      required: true
+    port_FSB_Internal_port_0_network_role:
+      type: string
+      required: true
+    port_FSB_Internal_port_0_network:
       type: list
       required: true
       entry_schema:
-        type: org.openecomp.datatypes.network.VlanRequirements
-    port_FSB2_Internal_order:
-      type: integer
+        type: string
+    port_FSB_Internal_port_1_network_role_tag:
+      type: string
       required: true
     port_FSB1_OAM_exCP_naming:
       type: org.openecomp.datatypes.Naming
       required: true
+    port_FSB_Internal_port_0_mac_address:
+      type: string
+      required: true
     port_FSB1_OAM_ip_requirements:
       type: list
       required: true
       entry_schema:
         type: org.openecomp.datatypes.network.IpRequirements
-    port_FSB2_Internal_ip_requirements:
+    port_FSB_Internal_port_0_vlan_requirements:
       type: list
       required: true
       entry_schema:
-        type: org.openecomp.datatypes.network.IpRequirements
+        type: org.openecomp.datatypes.network.VlanRequirements
     vm_flavor_name:
       type: string
       required: true
-    port_FSB2_Internal_network_role:
+    port_FSB_Internal_port_1_mac_address:
       type: string
       required: true
-    port_FSB1_Internal_related_networks:
+    port_FSB_Internal_port_0_related_networks:
       type: list
       required: true
       entry_schema:
         type: org.openecomp.datatypes.network.RelatedNetworksAssignments
-    port_FSB1_Internal_network_role_tag:
-      type: string
-      required: true
     port_FSB1_OAM_vlan_requirements:
       type: list
       required: true
       entry_schema:
         type: org.openecomp.datatypes.network.VlanRequirements
-    port_FSB1_Internal_vlan_requirements:
+    port_FSB_Internal_port_0_ip_requirements:
       type: list
       required: true
       entry_schema:
-        type: org.openecomp.datatypes.network.VlanRequirements
-    port_FSB2_Internal_subnetpoolid:
-      type: string
-      required: true
-    port_FSB1_Internal_exCP_naming:
-      type: org.openecomp.datatypes.Naming
-      required: true
-    port_FSB1_Internal_network_role:
-      type: string
-      required: true
+        type: org.openecomp.datatypes.network.IpRequirements
     port_FSB1_OAM_mac_requirements:
       type: org.openecomp.datatypes.network.MacRequirements
       required: true
-    compute_FSB1_availability_zone:
+    port_FSB_Internal_port_1_vlan_requirements:
       type: list
       required: true
       entry_schema:
-        type: string
-    port_FSB1_Internal_network:
+        type: org.openecomp.datatypes.network.VlanRequirements
+    compute_FSB1_availability_zone:
       type: list
       required: true
       entry_schema:
@@ -112,31 +101,31 @@ topology_template:
     port_FSB1_OAM_order:
       type: integer
       required: true
-    port_FSB2_Internal_mac_requirements:
+    port_FSB_Internal_port_0_mac_requirements:
       type: org.openecomp.datatypes.network.MacRequirements
       required: true
-    port_FSB2_Internal_mac_address:
-      type: string
-      required: true
     port_FSB1_OAM_network:
       type: list
       required: true
       entry_schema:
         type: string
-    port_FSB2_Internal_exCP_naming:
-      type: org.openecomp.datatypes.Naming
-      required: true
-    port_FSB1_Internal_order:
+    port_FSB_Internal_port_0_order:
       type: integer
       required: true
+    port_FSB_Internal_port_1_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.IpRequirements
+    port_FSB_Internal_port_0_exCP_naming:
+      type: org.openecomp.datatypes.Naming
+      required: true
     port_FSB1_OAM_network_role:
       type: string
       required: true
-    port_FSB2_Internal_network:
-      type: list
+    port_FSB_Internal_port_0_network_role_tag:
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_FSB1_OAM_related_networks:
       type: list
       required: true
@@ -145,118 +134,129 @@ topology_template:
     port_FSB1_OAM_network_role_tag:
       type: string
       required: true
-    port_FSB1_Internal_mac_requirements:
-      type: org.openecomp.datatypes.network.MacRequirements
-      required: true
     compute_FSB1_name:
       type: list
       required: true
       entry_schema:
         type: string
+    port_FSB_Internal_port_1_mac_requirements:
+      type: org.openecomp.datatypes.network.MacRequirements
+      required: true
     port_FSB1_OAM_fixed_ips:
       type: list
       required: true
       entry_schema:
         type: org.openecomp.datatypes.heat.neutron.port.FixedIps
-    port_FSB2_Internal_network_role_tag:
+    port_FSB_Internal_port_0_subnetpoolid:
+      type: string
+      required: true
+    port_FSB_Internal_port_1_exCP_naming:
+      type: org.openecomp.datatypes.Naming
+      required: true
+    port_FSB_Internal_port_1_network:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_FSB_Internal_port_1_subnetpoolid:
       type: string
       required: true
   node_templates:
-    FSB1_FSB1_Internal:
+    FSB1_FSB1_OAM:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         mac_requirements:
-          get_input: port_FSB1_Internal_mac_requirements
+          get_input: port_FSB1_OAM_mac_requirements
         order:
-          get_input: port_FSB1_Internal_order
-        mac_address:
-          get_input: port_FSB1_Internal_mac_address
+          get_input: port_FSB1_OAM_order
         exCP_naming:
-          get_input: port_FSB1_Internal_exCP_naming
+          get_input: port_FSB1_OAM_exCP_naming
         vlan_requirements:
-          get_input: port_FSB1_Internal_vlan_requirements
+          get_input: port_FSB1_OAM_vlan_requirements
         subinterface_indicator: false
         ip_requirements:
-          get_input: port_FSB1_Internal_ip_requirements
+          get_input: port_FSB1_OAM_ip_requirements
         related_networks:
-          get_input: port_FSB1_Internal_related_networks
+          get_input: port_FSB1_OAM_related_networks
         network_role_tag:
-          get_input: port_FSB1_Internal_network_role_tag
+          get_input: port_FSB1_OAM_network_role_tag
         network_role:
-          get_input: port_FSB1_Internal_network_role
+          get_input: port_FSB1_OAM_network_role
+        fixed_ips:
+          get_input:
+          - port_FSB1_OAM_fixed_ips
+          - index_value
         subnetpoolid:
-          get_input: port_FSB1_Internal_subnetpoolid
+          get_input: port_FSB1_OAM_subnetpoolid
         network:
           get_input:
-          - port_FSB1_Internal_network
+          - port_FSB1_OAM_network
           - index_value
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
           node: FSB1
           relationship: tosca.relationships.network.BindsTo
-    FSB1_FSB2_Internal:
+    FSB1_FSB_1_Internal_port_1:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         mac_requirements:
-          get_input: port_FSB2_Internal_mac_requirements
+          get_input: port_FSB_Internal_port_1_mac_requirements
         order:
-          get_input: port_FSB2_Internal_order
+          get_input: port_FSB_Internal_port_1_order
         mac_address:
-          get_input: port_FSB2_Internal_mac_address
+          get_input: port_FSB_Internal_port_1_mac_address
         exCP_naming:
-          get_input: port_FSB2_Internal_exCP_naming
+          get_input: port_FSB_Internal_port_1_exCP_naming
         vlan_requirements:
-          get_input: port_FSB2_Internal_vlan_requirements
+          get_input: port_FSB_Internal_port_1_vlan_requirements
         subinterface_indicator: false
         ip_requirements:
-          get_input: port_FSB2_Internal_ip_requirements
+          get_input: port_FSB_Internal_port_1_ip_requirements
         related_networks:
-          get_input: port_FSB2_Internal_related_networks
+          get_input: port_FSB_Internal_port_1_related_networks
         network_role_tag:
-          get_input: port_FSB2_Internal_network_role_tag
+          get_input: port_FSB_Internal_port_1_network_role_tag
         network_role:
-          get_input: port_FSB2_Internal_network_role
+          get_input: port_FSB_Internal_port_1_network_role
         subnetpoolid:
-          get_input: port_FSB2_Internal_subnetpoolid
+          get_input: port_FSB_Internal_port_1_subnetpoolid
         network:
           get_input:
-          - port_FSB2_Internal_network
+          - port_FSB_Internal_port_1_network
           - index_value
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
           node: FSB1
           relationship: tosca.relationships.network.BindsTo
-    FSB1_FSB1_OAM:
+    FSB1_FSB_1_Internal_port_0:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         mac_requirements:
-          get_input: port_FSB1_OAM_mac_requirements
+          get_input: port_FSB_Internal_port_0_mac_requirements
         order:
-          get_input: port_FSB1_OAM_order
+          get_input: port_FSB_Internal_port_0_order
+        mac_address:
+          get_input: port_FSB_Internal_port_0_mac_address
         exCP_naming:
-          get_input: port_FSB1_OAM_exCP_naming
+          get_input: port_FSB_Internal_port_0_exCP_naming
         vlan_requirements:
-          get_input: port_FSB1_OAM_vlan_requirements
+          get_input: port_FSB_Internal_port_0_vlan_requirements
         subinterface_indicator: false
         ip_requirements:
-          get_input: port_FSB1_OAM_ip_requirements
+          get_input: port_FSB_Internal_port_0_ip_requirements
         related_networks:
-          get_input: port_FSB1_OAM_related_networks
+          get_input: port_FSB_Internal_port_0_related_networks
         network_role_tag:
-          get_input: port_FSB1_OAM_network_role_tag
+          get_input: port_FSB_Internal_port_0_network_role_tag
         network_role:
-          get_input: port_FSB1_OAM_network_role
-        fixed_ips:
-          get_input:
-          - port_FSB1_OAM_fixed_ips
-          - index_value
+          get_input: port_FSB_Internal_port_0_network_role
         subnetpoolid:
-          get_input: port_FSB1_OAM_subnetpoolid
+          get_input: port_FSB_Internal_port_0_subnetpoolid
         network:
           get_input:
-          - port_FSB1_OAM_network
+          - port_FSB_Internal_port_0_network
           - index_value
       requirements:
       - binding:
@@ -296,15 +296,30 @@ topology_template:
       network.outgoing.bytes_FSB1_FSB1_OAM:
       - FSB1_FSB1_OAM
       - network.outgoing.bytes
-      binding_FSB1_FSB2_Internal:
-      - FSB1_FSB2_Internal
-      - binding
+      network.outgoing.packets.rate_FSB1_FSB_1_Internal_port_0:
+      - FSB1_FSB_1_Internal_port_0
+      - network.outgoing.packets.rate
+      network.outgoing.packets.rate_FSB1_FSB_1_Internal_port_1:
+      - FSB1_FSB_1_Internal_port_1
+      - network.outgoing.packets.rate
+      network.outpoing.packets_FSB1_FSB_1_Internal_port_1:
+      - FSB1_FSB_1_Internal_port_1
+      - network.outpoing.packets
+      network.outpoing.packets_FSB1_FSB_1_Internal_port_0:
+      - FSB1_FSB_1_Internal_port_0
+      - network.outpoing.packets
       disk.capacity_FSB1:
       - FSB1
       - disk.capacity
       disk.read.bytes.rate_FSB1:
       - FSB1
       - disk.read.bytes.rate
+      forwarder_FSB1_FSB_1_Internal_port_1:
+      - FSB1_FSB_1_Internal_port_1
+      - forwarder
+      forwarder_FSB1_FSB_1_Internal_port_0:
+      - FSB1_FSB_1_Internal_port_0
+      - forwarder
       disk.device.latency_FSB1:
       - FSB1
       - disk.device.latency
@@ -329,27 +344,9 @@ topology_template:
       disk.root.size_FSB1:
       - FSB1
       - disk.root.size
-      forwarder_FSB1_FSB2_Internal:
-      - FSB1_FSB2_Internal
-      - forwarder
       feature_FSB1:
       - FSB1
       - feature
-      network.incoming.packets.rate_FSB1_FSB1_Internal:
-      - FSB1_FSB1_Internal
-      - network.incoming.packets.rate
-      network.outgoing.bytes_FSB1_FSB1_Internal:
-      - FSB1_FSB1_Internal
-      - network.outgoing.bytes
-      feature_FSB1_FSB2_Internal:
-      - FSB1_FSB2_Internal
-      - feature
-      attachment_FSB1_FSB2_Internal:
-      - FSB1_FSB2_Internal
-      - attachment
-      network.incoming.packets_FSB1_FSB2_Internal:
-      - FSB1_FSB2_Internal
-      - network.incoming.packets
       forwarder_FSB1_FSB1_OAM:
       - FSB1_FSB1_OAM
       - forwarder
@@ -359,12 +356,6 @@ topology_template:
       network.incoming.packets.rate_FSB1_FSB1_OAM:
       - FSB1_FSB1_OAM
       - network.incoming.packets.rate
-      forwarder_FSB1_FSB1_Internal:
-      - FSB1_FSB1_Internal
-      - forwarder
-      network.incoming.packets.rate_FSB1_FSB2_Internal:
-      - FSB1_FSB2_Internal
-      - network.incoming.packets.rate
       cpu_FSB1:
       - FSB1
       - cpu
@@ -386,18 +377,36 @@ topology_template:
       disk.write.bytes_FSB1:
       - FSB1
       - disk.write.bytes
-      binding_FSB1_FSB1_Internal:
-      - FSB1_FSB1_Internal
-      - binding
+      attachment_FSB1_FSB_1_Internal_port_0:
+      - FSB1_FSB_1_Internal_port_0
+      - attachment
+      network.incoming.bytes.rate_FSB1_FSB_1_Internal_port_0:
+      - FSB1_FSB_1_Internal_port_0
+      - network.incoming.bytes.rate
       disk.device.read.requests.rate_FSB1:
       - FSB1
       - disk.device.read.requests.rate
-      feature_FSB1_FSB1_Internal:
-      - FSB1_FSB1_Internal
+      attachment_FSB1_FSB_1_Internal_port_1:
+      - FSB1_FSB_1_Internal_port_1
+      - attachment
+      network.incoming.bytes.rate_FSB1_FSB_1_Internal_port_1:
+      - FSB1_FSB_1_Internal_port_1
+      - network.incoming.bytes.rate
+      network.outgoing.bytes.rate_FSB1_FSB_1_Internal_port_0:
+      - FSB1_FSB_1_Internal_port_0
+      - network.outgoing.bytes.rate
+      network.outgoing.bytes.rate_FSB1_FSB_1_Internal_port_1:
+      - FSB1_FSB_1_Internal_port_1
+      - network.outgoing.bytes.rate
+      feature_FSB1_FSB_1_Internal_port_0:
+      - FSB1_FSB_1_Internal_port_0
       - feature
       disk.device.read.requests_FSB1:
       - FSB1
       - disk.device.read.requests
+      feature_FSB1_FSB_1_Internal_port_1:
+      - FSB1_FSB_1_Internal_port_1
+      - feature
       disk.ephemeral.size_FSB1:
       - FSB1
       - disk.ephemeral.size
@@ -416,27 +425,27 @@ topology_template:
       attachment_FSB1_FSB1_OAM:
       - FSB1_FSB1_OAM
       - attachment
-      network.incoming.packets_FSB1_FSB1_Internal:
-      - FSB1_FSB1_Internal
+      network.incoming.bytes_FSB1_FSB_1_Internal_port_0:
+      - FSB1_FSB_1_Internal_port_0
+      - network.incoming.bytes
+      network.incoming.bytes_FSB1_FSB_1_Internal_port_1:
+      - FSB1_FSB_1_Internal_port_1
+      - network.incoming.bytes
+      network.incoming.packets_FSB1_FSB_1_Internal_port_1:
+      - FSB1_FSB_1_Internal_port_1
       - network.incoming.packets
-      attachment_FSB1_FSB1_Internal:
-      - FSB1_FSB1_Internal
-      - attachment
       network.incoming.bytes_FSB1_FSB1_OAM:
       - FSB1_FSB1_OAM
       - network.incoming.bytes
+      network.incoming.packets_FSB1_FSB_1_Internal_port_0:
+      - FSB1_FSB_1_Internal_port_0
+      - network.incoming.packets
       memory_FSB1:
       - FSB1
       - memory
       network.incoming.packets_FSB1_FSB1_OAM:
       - FSB1_FSB1_OAM
       - network.incoming.packets
-      network.outpoing.packets_FSB1_FSB1_Internal:
-      - FSB1_FSB1_Internal
-      - network.outpoing.packets
-      network.outgoing.bytes.rate_FSB1_FSB2_Internal:
-      - FSB1_FSB2_Internal
-      - network.outgoing.bytes.rate
       disk.device.read.bytes_FSB1:
       - FSB1
       - disk.device.read.bytes
@@ -452,6 +461,12 @@ topology_template:
       disk.usage_FSB1:
       - FSB1
       - disk.usage
+      binding_FSB1_FSB_1_Internal_port_1:
+      - FSB1_FSB_1_Internal_port_1
+      - binding
+      binding_FSB1_FSB_1_Internal_port_0:
+      - FSB1_FSB_1_Internal_port_0
+      - binding
       network.outpoing.packets_FSB1_FSB1_OAM:
       - FSB1_FSB1_OAM
       - network.outpoing.packets
@@ -470,30 +485,15 @@ topology_template:
       disk.write.requests_FSB1:
       - FSB1
       - disk.write.requests
-      network.outgoing.bytes_FSB1_FSB2_Internal:
-      - FSB1_FSB2_Internal
+      network.outgoing.bytes_FSB1_FSB_1_Internal_port_1:
+      - FSB1_FSB_1_Internal_port_1
       - network.outgoing.bytes
-      network.incoming.bytes_FSB1_FSB1_Internal:
-      - FSB1_FSB1_Internal
-      - network.incoming.bytes
-      network.outpoing.packets_FSB1_FSB2_Internal:
-      - FSB1_FSB2_Internal
-      - network.outpoing.packets
       disk.device.write.bytes.rate_FSB1:
       - FSB1
       - disk.device.write.bytes.rate
-      network.outgoing.bytes.rate_FSB1_FSB1_Internal:
-      - FSB1_FSB1_Internal
-      - network.outgoing.bytes.rate
       endpoint_FSB1:
       - FSB1
       - endpoint
-      network.outgoing.packets.rate_FSB1_FSB1_Internal:
-      - FSB1_FSB1_Internal
-      - network.outgoing.packets.rate
-      network.incoming.bytes.rate_FSB1_FSB1_Internal:
-      - FSB1_FSB1_Internal
-      - network.incoming.bytes.rate
       disk.latency_FSB1:
       - FSB1
       - disk.latency
@@ -503,21 +503,21 @@ topology_template:
       disk.read.requests_FSB1:
       - FSB1
       - disk.read.requests
+      network.incoming.packets.rate_FSB1_FSB_1_Internal_port_1:
+      - FSB1_FSB_1_Internal_port_1
+      - network.incoming.packets.rate
       disk.device.write.requests_FSB1:
       - FSB1
       - disk.device.write.requests
-      network.incoming.bytes.rate_FSB1_FSB2_Internal:
-      - FSB1_FSB2_Internal
-      - network.incoming.bytes.rate
-      network.incoming.bytes_FSB1_FSB2_Internal:
-      - FSB1_FSB2_Internal
-      - network.incoming.bytes
+      network.incoming.packets.rate_FSB1_FSB_1_Internal_port_0:
+      - FSB1_FSB_1_Internal_port_0
+      - network.incoming.packets.rate
       disk.iops_FSB1:
       - FSB1
       - disk.iops
-      network.outgoing.packets.rate_FSB1_FSB2_Internal:
-      - FSB1_FSB2_Internal
-      - network.outgoing.packets.rate
+      network.outgoing.bytes_FSB1_FSB_1_Internal_port_0:
+      - FSB1_FSB_1_Internal_port_0
+      - network.outgoing.bytes
       disk.device.iops_FSB1:
       - FSB1
       - disk.device.iops
@@ -528,21 +528,21 @@ topology_template:
       dependency_FSB1_FSB1_OAM:
       - FSB1_FSB1_OAM
       - dependency
+      dependency_FSB1_FSB_1_Internal_port_1:
+      - FSB1_FSB_1_Internal_port_1
+      - dependency
       dependency_FSB1:
       - FSB1
       - dependency
-      link_FSB1_FSB2_Internal:
-      - FSB1_FSB2_Internal
-      - link
-      dependency_FSB1_FSB1_Internal:
-      - FSB1_FSB1_Internal
+      dependency_FSB1_FSB_1_Internal_port_0:
+      - FSB1_FSB_1_Internal_port_0
       - dependency
-      link_FSB1_FSB1_Internal:
-      - FSB1_FSB1_Internal
-      - link
       local_storage_FSB1:
       - FSB1
       - local_storage
-      dependency_FSB1_FSB2_Internal:
-      - FSB1_FSB2_Internal
-      - dependency
+      link_FSB1_FSB_1_Internal_port_0:
+      - FSB1_FSB_1_Internal_port_0
+      - link
+      link_FSB1_FSB_1_Internal_port_1:
+      - FSB1_FSB_1_Internal_port_1
+      - link