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

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/out/Nested_vdbeServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/out/Nested_vdbeServiceTemplate.yaml
index d962ae0bac..397bf3a939 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/out/Nested_vdbeServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/out/Nested_vdbeServiceTemplate.yaml
@@ -11,9 +11,6 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
-    port_vdbe_untr_port_network_role_tag:
-      type: string
-      required: true
     subinterface_nested_parent_interface:
       type: list
       required: true
@@ -29,9 +26,6 @@ topology_template:
       required: true
       entry_schema:
         type: json
-    port_vdbe_untr_port_subnetpoolid:
-      type: string
-      required: true
     compute_vdbe_availability_zone:
       type: list
       required: true
@@ -47,23 +41,31 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_vdbe_untr_port_1_name:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_vdbe_untr_port_1_network_role:
+      type: string
+      required: true
     vm_flavor_name:
       type: string
       required: true
-    port_vdbe_untr_port_order:
-      type: integer
+    port_vdbe_untr_port_1_network_role_tag:
+      type: string
       required: true
     subinterface_nested_aap_untrusted_ip_prefix:
       type: list
       required: true
       entry_schema:
         type: string
+    port_vdbe_untr_port_1_order:
+      type: integer
+      required: true
     vm_image_name:
       type: string
       required: true
-    port_vdbe_untr_port_exCP_naming:
-      type: org.openecomp.datatypes.Naming
-      required: true
     subinterface_nested_aap_sec_untrusted_ip_prefix_len:
       type: list
       required: true
@@ -94,14 +96,30 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_vdbe_untr_port_1_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     subinterface_nested_ip_v6_address:
       type: list
       required: true
       entry_schema:
         type: string
-    port_vdbe_untr_port_mac_requirements:
+    port_vdbe_untr_port_1_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.IpRequirements
+    port_vdbe_untr_port_1_subnetpoolid:
+      type: string
+      required: true
+    port_vdbe_untr_port_1_mac_requirements:
       type: org.openecomp.datatypes.network.MacRequirements
       required: true
+    port_vdbe_untr_port_1_exCP_naming:
+      type: org.openecomp.datatypes.Naming
+      required: true
     index_value:
       type: integer
       description: Index value of this substitution service template runtime instance
@@ -119,19 +137,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    port_vdbe_untr_port_name:
-      type: list
-      required: true
-      entry_schema:
-        type: string
-    port_vdbe_untr_port_vlan_requirements:
+    port_vdbe_untr_port_1_vlan_requirements:
       type: list
       required: true
       entry_schema:
         type: org.openecomp.datatypes.network.VlanRequirements
-    port_vdbe_untr_port_network_role:
-      type: string
-      required: true
     subinterface_nested_aap_untrusted_ip_prefix_len:
       type: list
       required: true
@@ -152,68 +162,8 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    port_vdbe_untr_port_related_networks:
-      type: list
-      required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
-    port_vdbe_untr_port_ip_requirements:
-      type: list
-      required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.IpRequirements
   node_templates:
-    vdbe:
-      type: org.openecomp.resource.vfc.compute.nodes.heat.vdbe
-      properties:
-        availability_zone:
-          get_input:
-          - compute_vdbe_availability_zone
-          - index_value
-        flavor:
-          get_input: vm_flavor_name
-        metadata:
-          get_input:
-          - compute_vdbe_metadata
-          - index_value
-        image:
-          get_input: vm_image_name
-        name:
-          get_input:
-          - compute_vdbe_name
-          - index_value
-    vdbe_vdbe_untr_port:
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        exCP_naming:
-          get_input: port_vdbe_untr_port_exCP_naming
-        vlan_requirements:
-          get_input: port_vdbe_untr_port_vlan_requirements
-        subinterface_indicator: true
-        related_networks:
-          get_input: port_vdbe_untr_port_related_networks
-        ip_requirements:
-          get_input: port_vdbe_untr_port_ip_requirements
-        network_role_tag:
-          get_input: port_vdbe_untr_port_network_role_tag
-        mac_requirements:
-          get_input: port_vdbe_untr_port_mac_requirements
-        order:
-          get_input: port_vdbe_untr_port_order
-        network_role:
-          get_input: port_vdbe_untr_port_network_role
-        subnetpoolid:
-          get_input: port_vdbe_untr_port_subnetpoolid
-        name:
-          get_input:
-          - port_vdbe_untr_port_name
-          - index_value
-      requirements:
-      - binding:
-          capability: tosca.capabilities.network.Bindable
-          node: vdbe
-          relationship: tosca.relationships.network.BindsTo
-    vdbe_vdbe_untr_port_nested:
+    vdbe_vdbe_untr_port_1_nested:
       type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested
       directives:
       - substitutable
@@ -292,32 +242,76 @@ topology_template:
       requirements:
       - binding_vdbe_0_subint_untr_vmi_0:
           capability: tosca.capabilities.network.Bindable
-          node: vdbe_vdbe_untr_port
+          node: vdbe_vdbe_untr_port_1
+          relationship: tosca.relationships.network.BindsTo
+    vdbe:
+      type: org.openecomp.resource.vfc.compute.nodes.heat.vdbe
+      properties:
+        availability_zone:
+          get_input:
+          - compute_vdbe_availability_zone
+          - index_value
+        flavor:
+          get_input: vm_flavor_name
+        metadata:
+          get_input:
+          - compute_vdbe_metadata
+          - index_value
+        image:
+          get_input: vm_image_name
+        name:
+          get_input:
+          - compute_vdbe_name
+          - index_value
+    vdbe_vdbe_untr_port_1:
+      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
+      properties:
+        exCP_naming:
+          get_input: port_vdbe_untr_port_1_exCP_naming
+        vlan_requirements:
+          get_input: port_vdbe_untr_port_1_vlan_requirements
+        subinterface_indicator: true
+        related_networks:
+          get_input: port_vdbe_untr_port_1_related_networks
+        ip_requirements:
+          get_input: port_vdbe_untr_port_1_ip_requirements
+        network_role_tag:
+          get_input: port_vdbe_untr_port_1_network_role_tag
+        mac_requirements:
+          get_input: port_vdbe_untr_port_1_mac_requirements
+        order:
+          get_input: port_vdbe_untr_port_1_order
+        network_role:
+          get_input: port_vdbe_untr_port_1_network_role
+        subnetpoolid:
+          get_input: port_vdbe_untr_port_1_subnetpoolid
+        name:
+          get_input:
+          - port_vdbe_untr_port_1_name
+          - index_value
+      requirements:
+      - binding:
+          capability: tosca.capabilities.network.Bindable
+          node: vdbe
           relationship: tosca.relationships.network.BindsTo
   substitution_mappings:
     node_type: org.openecomp.resource.abstract.nodes.vdbe
     capabilities:
-      network.outgoing.packets.rate_vdbe_vdbe_untr_port:
-      - vdbe_vdbe_untr_port
-      - network.outgoing.packets.rate
-      network.outgoing.bytes_vdbe_vdbe_untr_port:
-      - vdbe_vdbe_untr_port
-      - network.outgoing.bytes
+      forwarder_vdbe_vdbe_untr_port_1:
+      - vdbe_vdbe_untr_port_1
+      - forwarder
       feature_vdbe:
       - vdbe
       - feature
-      feature_vdbe_vdbe_untr_port:
-      - vdbe_vdbe_untr_port
-      - feature
-      attachment_vdbe_vdbe_untr_port:
-      - vdbe_vdbe_untr_port
-      - attachment
       disk.device.iops_vdbe:
       - vdbe
       - disk.device.iops
       endpoint_vdbe:
       - vdbe
       - endpoint
+      feature_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_1_nested:
+      - vdbe_vdbe_untr_port_1_nested
+      - feature_vdbe_0_subint_untr_vmi_0
       disk.ephemeral.size_vdbe:
       - vdbe
       - disk.ephemeral.size
@@ -336,15 +330,18 @@ topology_template:
       disk.device.write.requests.rate_vdbe:
       - vdbe
       - disk.device.write.requests.rate
+      feature_vdbe_vdbe_untr_port_1:
+      - vdbe_vdbe_untr_port_1
+      - feature
       disk.write.bytes.rate_vdbe:
       - vdbe
       - disk.write.bytes.rate
-      network.incoming.packets_vdbe_vdbe_untr_port:
-      - vdbe_vdbe_untr_port
-      - network.incoming.packets
-      feature_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_nested:
-      - vdbe_vdbe_untr_port_nested
-      - feature_vdbe_0_subint_untr_vmi_0
+      network.incoming.bytes.rate_vdbe_vdbe_untr_port_1:
+      - vdbe_vdbe_untr_port_1
+      - network.incoming.bytes.rate
+      network.incoming.packets.rate_vdbe_vdbe_untr_port_1:
+      - vdbe_vdbe_untr_port_1
+      - network.incoming.packets.rate
       scalable_vdbe:
       - vdbe
       - scalable
@@ -354,9 +351,15 @@ topology_template:
       disk.device.write.requests_vdbe:
       - vdbe
       - disk.device.write.requests
+      network.outgoing.packets.rate_vdbe_vdbe_untr_port_1:
+      - vdbe_vdbe_untr_port_1
+      - network.outgoing.packets.rate
       disk.device.capacity_vdbe:
       - vdbe
       - disk.device.capacity
+      network.outgoing.bytes_vdbe_vdbe_untr_port_1:
+      - vdbe_vdbe_untr_port_1
+      - network.outgoing.bytes
       disk.device.allocation_vdbe:
       - vdbe
       - disk.device.allocation
@@ -366,27 +369,21 @@ topology_template:
       memory.usage_vdbe:
       - vdbe
       - memory.usage
-      network.outpoing.packets_vdbe_vdbe_untr_port:
-      - vdbe_vdbe_untr_port
-      - network.outpoing.packets
-      network.outgoing.bytes.rate_vdbe_vdbe_untr_port:
-      - vdbe_vdbe_untr_port
-      - network.outgoing.bytes.rate
       disk.read.requests_vdbe:
       - vdbe
       - disk.read.requests
-      forwarder_vdbe_vdbe_untr_port:
-      - vdbe_vdbe_untr_port
-      - forwarder
-      binding_vdbe_vdbe_untr_port:
-      - vdbe_vdbe_untr_port
+      binding_vdbe_vdbe_untr_port_1:
+      - vdbe_vdbe_untr_port_1
       - binding
+      network.incoming.bytes_vdbe_vdbe_untr_port_1:
+      - vdbe_vdbe_untr_port_1
+      - network.incoming.bytes
       instance_vdbe:
       - vdbe
       - instance
-      network.incoming.bytes.rate_vdbe_vdbe_untr_port:
-      - vdbe_vdbe_untr_port
-      - network.incoming.bytes.rate
+      network.outgoing.bytes.rate_vdbe_vdbe_untr_port_1:
+      - vdbe_vdbe_untr_port_1
+      - network.outgoing.bytes.rate
       cpu.delta_vdbe:
       - vdbe
       - cpu.delta
@@ -399,9 +396,6 @@ topology_template:
       memory.resident_vdbe:
       - vdbe
       - memory.resident
-      feature_vdbe_vdbe_untr_port_nested:
-      - vdbe_vdbe_untr_port_nested
-      - feature
       disk.write.requests.rate_vdbe:
       - vdbe
       - disk.write.requests.rate
@@ -420,9 +414,9 @@ topology_template:
       disk.latency_vdbe:
       - vdbe
       - disk.latency
-      network.incoming.bytes_vdbe_vdbe_untr_port:
-      - vdbe_vdbe_untr_port
-      - network.incoming.bytes
+      attachment_vdbe_vdbe_untr_port_1:
+      - vdbe_vdbe_untr_port_1
+      - attachment
       disk.capacity_vdbe:
       - vdbe
       - disk.capacity
@@ -432,12 +426,21 @@ topology_template:
       disk.allocation_vdbe:
       - vdbe
       - disk.allocation
+      network.outpoing.packets_vdbe_vdbe_untr_port_1:
+      - vdbe_vdbe_untr_port_1
+      - network.outpoing.packets
       disk.read.bytes.rate_vdbe:
       - vdbe
       - disk.read.bytes.rate
+      network.incoming.packets_vdbe_vdbe_untr_port_1:
+      - vdbe_vdbe_untr_port_1
+      - network.incoming.packets
       os_vdbe:
       - vdbe
       - os
+      feature_vdbe_vdbe_untr_port_1_nested:
+      - vdbe_vdbe_untr_port_1_nested
+      - feature
       disk.device.read.requests_vdbe:
       - vdbe
       - disk.device.read.requests
@@ -459,28 +462,25 @@ topology_template:
       disk.read.bytes_vdbe:
       - vdbe
       - disk.read.bytes
-      network.incoming.packets.rate_vdbe_vdbe_untr_port:
-      - vdbe_vdbe_untr_port
-      - network.incoming.packets.rate
     requirements:
-      dependency_vdbe_vdbe_untr_port:
-      - vdbe_vdbe_untr_port
+      dependency_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_1_nested:
+      - vdbe_vdbe_untr_port_1_nested
+      - dependency_vdbe_0_subint_untr_vmi_0
+      subinterface_link_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_1_nested:
+      - vdbe_vdbe_untr_port_1_nested
+      - subinterface_link_vdbe_0_subint_untr_vmi_0
+      dependency_vdbe_vdbe_untr_port_1_nested:
+      - vdbe_vdbe_untr_port_1_nested
+      - dependency
+      dependency_vdbe_vdbe_untr_port_1:
+      - vdbe_vdbe_untr_port_1
       - dependency
-      link_vdbe_vdbe_untr_port:
-      - vdbe_vdbe_untr_port
+      link_vdbe_vdbe_untr_port_1:
+      - vdbe_vdbe_untr_port_1
       - link
       local_storage_vdbe:
       - vdbe
       - local_storage
-      dependency_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_nested:
-      - vdbe_vdbe_untr_port_nested
-      - dependency_vdbe_0_subint_untr_vmi_0
-      subinterface_link_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_nested:
-      - vdbe_vdbe_untr_port_nested
-      - subinterface_link_vdbe_0_subint_untr_vmi_0
-      dependency_vdbe_vdbe_untr_port_nested:
-      - vdbe_vdbe_untr_port_nested
-      - dependency
       dependency_vdbe:
       - vdbe
-      - dependency
\ No newline at end of file
+      - dependency