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

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/Nested_pd_serverServiceTemplate.yaml
index 376d974422..3854e84393 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/Nested_pd_serverServiceTemplate.yaml
@@ -11,6 +11,14 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
+    port_pd_server_mgmt_port_0_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+    port_pd_server_mgmt_port_0_exCP_naming:
+      type: org.openecomp.datatypes.Naming
+      required: true
     index_value:
       type: integer
       description: Index value of this substitution service template runtime instance
@@ -28,50 +36,42 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    port_pd01_port_exCP_naming:
-      type: org.openecomp.datatypes.Naming
+    port_pd_server_mgmt_port_0_mac_requirements:
+      type: org.openecomp.datatypes.network.MacRequirements
       required: true
-    port_pd01_port_related_networks:
-      type: list
+    port_pd_server_mgmt_port_0_subnetpoolid:
+      type: string
       required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     vm_flavor_name:
       type: string
       required: true
-    port_pd01_port_mac_requirements:
-      type: org.openecomp.datatypes.network.MacRequirements
-      required: true
-    vm_image_name:
-      type: string
+    port_pd_server_mgmt_port_0_order:
+      type: integer
       required: true
-    port_pd01_port_ip_requirements:
+    port_pd_server_mgmt_port_0_vlan_requirements:
       type: list
       required: true
       entry_schema:
-        type: org.openecomp.datatypes.network.IpRequirements
-    port_pd01_port_network:
+        type: org.openecomp.datatypes.network.VlanRequirements
+    vm_image_name:
+      type: string
+      required: true
+    port_pd_server_mgmt_port_0_network:
       type: list
       required: true
       entry_schema:
         type: string
-    port_pd01_port_order:
-      type: integer
-      required: true
-    port_pd01_port_subnetpoolid:
+    port_pd_server_mgmt_port_0_network_role:
       type: string
       required: true
-    port_pd01_port_network_role:
+    port_pd_server_mgmt_port_0_network_role_tag:
       type: string
       required: true
-    port_pd01_port_network_role_tag:
-      type: string
-      required: true
-    port_pd01_port_vlan_requirements:
+    port_pd_server_mgmt_port_0_ip_requirements:
       type: list
       required: true
       entry_schema:
-        type: org.openecomp.datatypes.network.VlanRequirements
+        type: org.openecomp.datatypes.network.IpRequirements
   node_templates:
     pd_server:
       type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server
@@ -90,9 +90,9 @@ topology_template:
           - index_value
         user_data_format:
           get_attribute:
-          - pd_server_pd01_port
+          - pd_server_pd_server_mgmt_port_0
           - device_id
-    pd_server_pd01_port:
+    pd_server_pd_server_mgmt_port_0:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         replacement_policy:
@@ -100,27 +100,27 @@ topology_template:
           - pd_server
           - accessIPv4
         mac_requirements:
-          get_input: port_pd01_port_mac_requirements
+          get_input: port_pd_server_mgmt_port_0_mac_requirements
         order:
-          get_input: port_pd01_port_order
+          get_input: port_pd_server_mgmt_port_0_order
         exCP_naming:
-          get_input: port_pd01_port_exCP_naming
+          get_input: port_pd_server_mgmt_port_0_exCP_naming
         vlan_requirements:
-          get_input: port_pd01_port_vlan_requirements
+          get_input: port_pd_server_mgmt_port_0_vlan_requirements
         subinterface_indicator: false
         ip_requirements:
-          get_input: port_pd01_port_ip_requirements
+          get_input: port_pd_server_mgmt_port_0_ip_requirements
         related_networks:
-          get_input: port_pd01_port_related_networks
+          get_input: port_pd_server_mgmt_port_0_related_networks
         network_role_tag:
-          get_input: port_pd01_port_network_role_tag
+          get_input: port_pd_server_mgmt_port_0_network_role_tag
         network_role:
-          get_input: port_pd01_port_network_role
+          get_input: port_pd_server_mgmt_port_0_network_role
         subnetpoolid:
-          get_input: port_pd01_port_subnetpoolid
+          get_input: port_pd_server_mgmt_port_0_subnetpoolid
         network:
           get_input:
-          - port_pd01_port_network
+          - port_pd_server_mgmt_port_0_network
           - index_value
       requirements:
       - binding:
@@ -145,24 +145,27 @@ topology_template:
       disk.device.usage_pd_server:
       - pd_server
       - disk.device.usage
-      network.outgoing.packets.rate_pd_server_pd01_port:
-      - pd_server_pd01_port
-      - network.outgoing.packets.rate
+      network.incoming.bytes.rate_pd_server_pd_server_mgmt_port_0:
+      - pd_server_pd_server_mgmt_port_0
+      - network.incoming.bytes.rate
       os_pd_server:
       - pd_server
       - os
       disk.write.bytes.rate_pd_server:
       - pd_server
       - disk.write.bytes.rate
-      network.incoming.bytes_pd_server_pd01_port:
-      - pd_server_pd01_port
-      - network.incoming.bytes
       cpu_pd_server:
       - pd_server
       - cpu
       cpu_util_pd_server:
       - pd_server
       - cpu_util
+      attachment_pd_server_pd_server_mgmt_port_0:
+      - pd_server_pd_server_mgmt_port_0
+      - attachment
+      network.incoming.packets_pd_server_pd_server_mgmt_port_0:
+      - pd_server_pd_server_mgmt_port_0
+      - network.incoming.packets
       disk.device.write.requests.rate_pd_server:
       - pd_server
       - disk.device.write.requests.rate
@@ -172,24 +175,27 @@ topology_template:
       disk.device.read.bytes.rate_pd_server:
       - pd_server
       - disk.device.read.bytes.rate
-      network.outgoing.bytes_pd_server_pd01_port:
-      - pd_server_pd01_port
-      - network.outgoing.bytes
       disk.iops_pd_server:
       - pd_server
       - disk.iops
+      network.outgoing.bytes.rate_pd_server_pd_server_mgmt_port_0:
+      - pd_server_pd_server_mgmt_port_0
+      - network.outgoing.bytes.rate
       memory.resident_pd_server:
       - pd_server
       - memory.resident
       cpu.delta_pd_server:
       - pd_server
       - cpu.delta
-      network.incoming.packets.rate_pd_server_pd01_port:
-      - pd_server_pd01_port
-      - network.incoming.packets.rate
+      network.outpoing.packets_pd_server_pd_server_mgmt_port_0:
+      - pd_server_pd_server_mgmt_port_0
+      - network.outpoing.packets
       vcpus_pd_server:
       - pd_server
       - vcpus
+      network.outgoing.packets.rate_pd_server_pd_server_mgmt_port_0:
+      - pd_server_pd_server_mgmt_port_0
+      - network.outgoing.packets.rate
       disk.device.write.bytes.rate_pd_server:
       - pd_server
       - disk.device.write.bytes.rate
@@ -199,9 +205,6 @@ topology_template:
       endpoint_pd_server:
       - pd_server
       - endpoint
-      attachment_pd_server_pd01_port:
-      - pd_server_pd01_port
-      - attachment
       disk.capacity_pd_server:
       - pd_server
       - disk.capacity
@@ -211,30 +214,33 @@ topology_template:
       disk.allocation_pd_server:
       - pd_server
       - disk.allocation
+      forwarder_pd_server_pd_server_mgmt_port_0:
+      - pd_server_pd_server_mgmt_port_0
+      - forwarder
       binding_pd_server:
       - pd_server
       - binding
       disk.read.requests_pd_server:
       - pd_server
       - disk.read.requests
+      network.incoming.bytes_pd_server_pd_server_mgmt_port_0:
+      - pd_server_pd_server_mgmt_port_0
+      - network.incoming.bytes
       feature_pd_server:
       - pd_server
       - feature
       disk.usage_pd_server:
       - pd_server
       - disk.usage
-      binding_pd_server_pd01_port:
-      - pd_server_pd01_port
-      - binding
+      network.incoming.packets.rate_pd_server_pd_server_mgmt_port_0:
+      - pd_server_pd_server_mgmt_port_0
+      - network.incoming.packets.rate
       disk.write.bytes_pd_server:
       - pd_server
       - disk.write.bytes
-      network.incoming.bytes.rate_pd_server_pd01_port:
-      - pd_server_pd01_port
-      - network.incoming.bytes.rate
-      network.incoming.packets_pd_server_pd01_port:
-      - pd_server_pd01_port
-      - network.incoming.packets
+      binding_pd_server_pd_server_mgmt_port_0:
+      - pd_server_pd_server_mgmt_port_0
+      - binding
       disk.device.read.requests.rate_pd_server:
       - pd_server
       - disk.device.read.requests.rate
@@ -256,12 +262,12 @@ topology_template:
       host_pd_server:
       - pd_server
       - host
-      network.outpoing.packets_pd_server_pd01_port:
-      - pd_server_pd01_port
-      - network.outpoing.packets
-      forwarder_pd_server_pd01_port:
-      - pd_server_pd01_port
-      - forwarder
+      feature_pd_server_pd_server_mgmt_port_0:
+      - pd_server_pd_server_mgmt_port_0
+      - feature
+      network.outgoing.bytes_pd_server_pd_server_mgmt_port_0:
+      - pd_server_pd_server_mgmt_port_0
+      - network.outgoing.bytes
       disk.write.requests.rate_pd_server:
       - pd_server
       - disk.write.requests.rate
@@ -271,9 +277,6 @@ topology_template:
       disk.write.requests_pd_server:
       - pd_server
       - disk.write.requests
-      feature_pd_server_pd01_port:
-      - pd_server_pd01_port
-      - feature
       disk.device.latency_pd_server:
       - pd_server
       - disk.device.latency
@@ -283,9 +286,6 @@ topology_template:
       disk.device.capacity_pd_server:
       - pd_server
       - disk.device.capacity
-      network.outgoing.bytes.rate_pd_server_pd01_port:
-      - pd_server_pd01_port
-      - network.outgoing.bytes.rate
       disk.device.iops_pd_server:
       - pd_server
       - disk.device.iops
@@ -293,12 +293,12 @@ topology_template:
       local_storage_pd_server:
       - pd_server
       - local_storage
-      link_pd_server_pd01_port:
-      - pd_server_pd01_port
+      link_pd_server_pd_server_mgmt_port_0:
+      - pd_server_pd_server_mgmt_port_0
       - link
-      dependency_pd_server_pd01_port:
-      - pd_server_pd01_port
-      - dependency
       dependency_pd_server:
       - pd_server
-      - dependency
\ No newline at end of file
+      - dependency
+      dependency_pd_server_pd_server_mgmt_port_0:
+      - pd_server_pd_server_mgmt_port_0
+      - dependency