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

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/Nested_ps_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/Nested_ps_server_1bServiceTemplate.yaml
index 2cdd4ed59a..048e4146de 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/Nested_ps_server_1bServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/Nested_ps_server_1bServiceTemplate.yaml
@@ -11,27 +11,24 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
-    port_ps_server_1b_port_vlan_requirements:
+    port_ps_server_1b_port_2_network:
       type: list
       required: true
       entry_schema:
-        type: org.openecomp.datatypes.network.VlanRequirements
-    port_ps_server_1b_port_mac_requirements:
-      type: org.openecomp.datatypes.network.MacRequirements
-      required: true
-    subinterface_nested_vlan_service_template_filter_count:
+        type: string
+    port_ps_server_1b_port_2_ip_requirements:
       type: list
       required: true
       entry_schema:
-        type: float
-    port_ps_server_1b_port_network_role_tag:
-      type: string
+        type: org.openecomp.datatypes.network.IpRequirements
+    port_ps_server_1b_port_2_order:
+      type: integer
       required: true
-    port_ps_server_1b_port_fixed_ips:
+    subinterface_nested_vlan_service_template_filter_count:
       type: list
       required: true
       entry_schema:
-        type: org.openecomp.datatypes.heat.neutron.port.FixedIps
+        type: float
     index_value:
       type: integer
       description: Index value of this substitution service template runtime instance
@@ -39,42 +36,43 @@ topology_template:
       default: 0
       constraints:
       - greater_or_equal: 0
-    port_ps_server_1b_port_order:
-      type: integer
+    port_ps_server_1b_port_2_vlan_requirements:
+      type: list
       required: true
-    vm_flavor_name:
+      entry_schema:
+        type: org.openecomp.datatypes.network.VlanRequirements
+    port_ps_server_1b_port_2_network_role:
       type: string
       required: true
-    port_ps_server_1b_port_related_networks:
-      type: list
+    port_ps_server_1b_port_2_subnetpoolid:
+      type: string
       required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
-    port_ps_server_1b_port_network:
-      type: list
+    vm_flavor_name:
+      type: string
       required: true
-      entry_schema:
-        type: string
-    port_ps_server_1b_port_exCP_naming:
+    port_ps_server_1b_port_2_exCP_naming:
       type: org.openecomp.datatypes.Naming
       required: true
+    port_ps_server_1b_port_2_network_role_tag:
+      type: string
+      required: true
     subinterface_nested_vlan_net1:
       type: list
       required: true
       entry_schema:
         type: string
-    port_ps_server_1b_port_ip_requirements:
+    port_ps_server_1b_port_2_fixed_ips:
       type: list
       required: true
       entry_schema:
-        type: org.openecomp.datatypes.network.IpRequirements
-    vm_image_name:
-      type: string
+        type: org.openecomp.datatypes.heat.neutron.port.FixedIps
+    port_ps_server_1b_port_2_mac_requirements:
+      type: org.openecomp.datatypes.network.MacRequirements
       required: true
-    port_ps_server_1b_port_network_role:
+    vm_image_name:
       type: string
       required: true
-    port_ps_server_1b_port_replacement_policy:
+    port_ps_server_1b_port_2_replacement_policy:
       type: list
       required: true
       entry_schema:
@@ -84,9 +82,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    port_ps_server_1b_port_subnetpoolid:
-      type: string
+    port_ps_server_1b_port_2_related_networks:
+      type: list
       required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     compute_ps_server_1b_availability_zone:
       type: list
       required: true
@@ -113,7 +113,7 @@ topology_template:
           get_input:
           - compute_ps_server_1b_name
           - index_value
-    ps_server_1b_ps_server_1b_port_nested_vlan:
+    ps_server_1b_ps_server_1b_port_2_nested_vlan:
       type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested_vlan
       directives:
       - substitutable
@@ -136,41 +136,41 @@ topology_template:
       requirements:
       - binding_template_Vlan_vmi_1:
           capability: tosca.capabilities.network.Bindable
-          node: ps_server_1b_ps_server_1b_port
+          node: ps_server_1b_ps_server_1b_port_2
           relationship: tosca.relationships.network.BindsTo
-    ps_server_1b_ps_server_1b_port:
+    ps_server_1b_ps_server_1b_port_2:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         replacement_policy:
           get_input:
-          - port_ps_server_1b_port_replacement_policy
+          - port_ps_server_1b_port_2_replacement_policy
           - index_value
         mac_requirements:
-          get_input: port_ps_server_1b_port_mac_requirements
+          get_input: port_ps_server_1b_port_2_mac_requirements
         order:
-          get_input: port_ps_server_1b_port_order
+          get_input: port_ps_server_1b_port_2_order
         exCP_naming:
-          get_input: port_ps_server_1b_port_exCP_naming
+          get_input: port_ps_server_1b_port_2_exCP_naming
         vlan_requirements:
-          get_input: port_ps_server_1b_port_vlan_requirements
+          get_input: port_ps_server_1b_port_2_vlan_requirements
         subinterface_indicator: true
         ip_requirements:
-          get_input: port_ps_server_1b_port_ip_requirements
+          get_input: port_ps_server_1b_port_2_ip_requirements
         related_networks:
-          get_input: port_ps_server_1b_port_related_networks
+          get_input: port_ps_server_1b_port_2_related_networks
         network_role_tag:
-          get_input: port_ps_server_1b_port_network_role_tag
+          get_input: port_ps_server_1b_port_2_network_role_tag
         network_role:
-          get_input: port_ps_server_1b_port_network_role
+          get_input: port_ps_server_1b_port_2_network_role
         fixed_ips:
           get_input:
-          - port_ps_server_1b_port_fixed_ips
+          - port_ps_server_1b_port_2_fixed_ips
           - index_value
         subnetpoolid:
-          get_input: port_ps_server_1b_port_subnetpoolid
+          get_input: port_ps_server_1b_port_2_subnetpoolid
         network:
           get_input:
-          - port_ps_server_1b_port_network
+          - port_ps_server_1b_port_2_network
           - index_value
       requirements:
       - binding:
@@ -192,12 +192,18 @@ topology_template:
       disk.device.write.requests_ps_server_1b:
       - ps_server_1b
       - disk.device.write.requests
+      network.outgoing.bytes_ps_server_1b_ps_server_1b_port_2:
+      - ps_server_1b_ps_server_1b_port_2
+      - network.outgoing.bytes
       cpu_util_ps_server_1b:
       - ps_server_1b
       - cpu_util
       scalable_ps_server_1b:
       - ps_server_1b
       - scalable
+      feature_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_2_nested_vlan:
+      - ps_server_1b_ps_server_1b_port_2_nested_vlan
+      - feature_template_Vlan_vmi_1
       disk.device.read.bytes.rate_ps_server_1b:
       - ps_server_1b
       - disk.device.read.bytes.rate
@@ -207,18 +213,12 @@ topology_template:
       disk.device.iops_ps_server_1b:
       - ps_server_1b
       - disk.device.iops
-      attachment_ps_server_1b_ps_server_1b_port:
-      - ps_server_1b_ps_server_1b_port
-      - attachment
-      network.outgoing.packets.rate_ps_server_1b_ps_server_1b_port:
-      - ps_server_1b_ps_server_1b_port
+      network.outgoing.packets.rate_ps_server_1b_ps_server_1b_port_2:
+      - ps_server_1b_ps_server_1b_port_2
       - network.outgoing.packets.rate
       disk.device.capacity_ps_server_1b:
       - ps_server_1b
       - disk.device.capacity
-      forwarder_ps_server_1b_ps_server_1b_port:
-      - ps_server_1b_ps_server_1b_port
-      - forwarder
       instance_ps_server_1b:
       - ps_server_1b
       - instance
@@ -231,9 +231,15 @@ topology_template:
       disk.read.bytes.rate_ps_server_1b:
       - ps_server_1b
       - disk.read.bytes.rate
+      network.incoming.packets_ps_server_1b_ps_server_1b_port_2:
+      - ps_server_1b_ps_server_1b_port_2
+      - network.incoming.packets
       disk.device.read.requests_ps_server_1b:
       - ps_server_1b
       - disk.device.read.requests
+      attachment_ps_server_1b_ps_server_1b_port_2:
+      - ps_server_1b_ps_server_1b_port_2
+      - attachment
       host_ps_server_1b:
       - ps_server_1b
       - host
@@ -243,17 +249,14 @@ topology_template:
       disk.read.requests_ps_server_1b:
       - ps_server_1b
       - disk.read.requests
-      feature_ps_server_1b_ps_server_1b_port_nested_vlan:
-      - ps_server_1b_ps_server_1b_port_nested_vlan
-      - feature
       disk.device.read.requests.rate_ps_server_1b:
       - ps_server_1b
       - disk.device.read.requests.rate
       disk.capacity_ps_server_1b:
       - ps_server_1b
       - disk.capacity
-      network.incoming.bytes_ps_server_1b_ps_server_1b_port:
-      - ps_server_1b_ps_server_1b_port
+      network.incoming.bytes_ps_server_1b_ps_server_1b_port_2:
+      - ps_server_1b_ps_server_1b_port_2
       - network.incoming.bytes
       disk.write.requests.rate_ps_server_1b:
       - ps_server_1b
@@ -270,6 +273,9 @@ topology_template:
       binding_ps_server_1b:
       - ps_server_1b
       - binding
+      feature_ps_server_1b_ps_server_1b_port_2_nested_vlan:
+      - ps_server_1b_ps_server_1b_port_2_nested_vlan
+      - feature
       memory.resident_ps_server_1b:
       - ps_server_1b
       - memory.resident
@@ -285,17 +291,8 @@ topology_template:
       disk.read.bytes_ps_server_1b:
       - ps_server_1b
       - disk.read.bytes
-      network.incoming.packets.rate_ps_server_1b_ps_server_1b_port:
-      - ps_server_1b_ps_server_1b_port
-      - network.incoming.packets.rate
-      network.outgoing.bytes_ps_server_1b_ps_server_1b_port:
-      - ps_server_1b_ps_server_1b_port
-      - network.outgoing.bytes
-      network.incoming.packets_ps_server_1b_ps_server_1b_port:
-      - ps_server_1b_ps_server_1b_port
-      - network.incoming.packets
-      network.outgoing.bytes.rate_ps_server_1b_ps_server_1b_port:
-      - ps_server_1b_ps_server_1b_port
+      network.outgoing.bytes.rate_ps_server_1b_ps_server_1b_port_2:
+      - ps_server_1b_ps_server_1b_port_2
       - network.outgoing.bytes.rate
       feature_ps_server_1b:
       - ps_server_1b
@@ -303,6 +300,9 @@ topology_template:
       os_ps_server_1b:
       - ps_server_1b
       - os
+      forwarder_ps_server_1b_ps_server_1b_port_2:
+      - ps_server_1b_ps_server_1b_port_2
+      - forwarder
       disk.iops_ps_server_1b:
       - ps_server_1b
       - disk.iops
@@ -312,58 +312,58 @@ topology_template:
       disk.write.requests_ps_server_1b:
       - ps_server_1b
       - disk.write.requests
-      network.outpoing.packets_ps_server_1b_ps_server_1b_port:
-      - ps_server_1b_ps_server_1b_port
-      - network.outpoing.packets
       memory.usage_ps_server_1b:
       - ps_server_1b
       - memory.usage
+      binding_ps_server_1b_ps_server_1b_port_2:
+      - ps_server_1b_ps_server_1b_port_2
+      - binding
       disk.latency_ps_server_1b:
       - ps_server_1b
       - disk.latency
+      network.incoming.packets.rate_ps_server_1b_ps_server_1b_port_2:
+      - ps_server_1b_ps_server_1b_port_2
+      - network.incoming.packets.rate
       endpoint_ps_server_1b:
       - ps_server_1b
       - endpoint
-      network.incoming.bytes.rate_ps_server_1b_ps_server_1b_port:
-      - ps_server_1b_ps_server_1b_port
-      - network.incoming.bytes.rate
-      feature_ps_server_1b_ps_server_1b_port:
-      - ps_server_1b_ps_server_1b_port
-      - feature
+      network.outpoing.packets_ps_server_1b_ps_server_1b_port_2:
+      - ps_server_1b_ps_server_1b_port_2
+      - network.outpoing.packets
       vcpus_ps_server_1b:
       - ps_server_1b
       - vcpus
+      network.incoming.bytes.rate_ps_server_1b_ps_server_1b_port_2:
+      - ps_server_1b_ps_server_1b_port_2
+      - network.incoming.bytes.rate
       cpu.delta_ps_server_1b:
       - ps_server_1b
       - cpu.delta
       disk.ephemeral.size_ps_server_1b:
       - ps_server_1b
       - disk.ephemeral.size
-      binding_ps_server_1b_ps_server_1b_port:
-      - ps_server_1b_ps_server_1b_port
-      - binding
-      feature_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan:
-      - ps_server_1b_ps_server_1b_port_nested_vlan
-      - feature_template_Vlan_vmi_1
+      feature_ps_server_1b_ps_server_1b_port_2:
+      - ps_server_1b_ps_server_1b_port_2
+      - feature
     requirements:
-      dependency_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan:
-      - ps_server_1b_ps_server_1b_port_nested_vlan
-      - dependency_template_Vlan_vmi_1
-      subinterface_link_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan:
-      - ps_server_1b_ps_server_1b_port_nested_vlan
+      subinterface_link_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_2_nested_vlan:
+      - ps_server_1b_ps_server_1b_port_2_nested_vlan
       - subinterface_link_template_Vlan_vmi_1
+      dependency_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_2_nested_vlan:
+      - ps_server_1b_ps_server_1b_port_2_nested_vlan
+      - dependency_template_Vlan_vmi_1
+      dependency_ps_server_1b_ps_server_1b_port_2:
+      - ps_server_1b_ps_server_1b_port_2
+      - dependency
+      link_ps_server_1b_ps_server_1b_port_2:
+      - ps_server_1b_ps_server_1b_port_2
+      - link
+      dependency_ps_server_1b_ps_server_1b_port_2_nested_vlan:
+      - ps_server_1b_ps_server_1b_port_2_nested_vlan
+      - dependency
       local_storage_ps_server_1b:
       - ps_server_1b
       - local_storage
-      dependency_ps_server_1b_ps_server_1b_port_nested_vlan:
-      - ps_server_1b_ps_server_1b_port_nested_vlan
-      - dependency
-      dependency_ps_server_1b_ps_server_1b_port:
-      - ps_server_1b_ps_server_1b_port
-      - dependency
-      link_ps_server_1b_ps_server_1b_port:
-      - ps_server_1b_ps_server_1b_port
-      - link
       dependency_ps_server_1b:
       - ps_server_1b
-      - dependency
\ No newline at end of file
+      - dependency