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>

4 files changed, 357 insertions, 357 deletions

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/GlobalSubstitutionTypesServiceTemplate.yaml
index a7bda34fb6..4e72ded9e5 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -8,82 +8,82 @@ node_types:
   org.openecomp.resource.abstract.nodes.pd_server:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
-      index_value:
-        type: integer
-        description: Index value of this substitution service template runtime instance
-        required: false
-        default: 0
-        status: SUPPORTED
-        constraints:
-        - greater_or_equal: 0
-      compute_pd_server_availability_zone:
-        type: list
+      port_pd01_port_0_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
-      compute_pd_server_name:
+      port_pd01_port_0_network:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_pd01_port_exCP_naming:
-        type: org.openecomp.datatypes.Naming
-        required: true
-        status: SUPPORTED
-      port_pd01_port_related_networks:
+      port_pd01_port_0_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
-      vm_flavor_name:
+          type: org.openecomp.datatypes.network.IpRequirements
+      port_pd01_port_0_network_role_tag:
         type: string
         required: true
         status: SUPPORTED
-      port_pd01_port_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
-        required: true
-        status: SUPPORTED
-      vm_image_name:
+      port_pd01_port_0_network_role:
         type: string
         required: true
         status: SUPPORTED
-      port_pd01_port_ip_requirements:
+      port_pd01_port_0_related_networks:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
-      port_pd01_port_network:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+      index_value:
+        type: integer
+        description: Index value of this substitution service template runtime instance
+        required: false
+        default: 0
+        status: SUPPORTED
+        constraints:
+        - greater_or_equal: 0
+      compute_pd_server_availability_zone:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_pd01_port_order:
-        type: integer
+      compute_pd_server_name:
+        type: list
         required: true
         status: SUPPORTED
-      port_pd01_port_subnetpoolid:
+        entry_schema:
+          type: string
+      vm_flavor_name:
         type: string
         required: true
         status: SUPPORTED
-      port_pd01_port_network_role:
-        type: string
+      port_pd01_port_0_exCP_naming:
+        type: org.openecomp.datatypes.Naming
+        required: true
+        status: SUPPORTED
+      port_pd01_port_0_order:
+        type: integer
         required: true
         status: SUPPORTED
-      port_pd01_port_network_role_tag:
+      vm_image_name:
         type: string
         required: true
         status: SUPPORTED
-      port_pd01_port_vlan_requirements:
+      port_pd01_port_0_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
+      port_pd01_port_0_subnetpoolid:
+        type: string
+        required: true
+        status: SUPPORTED
       compute_pd_server_user_data_format:
         type: list
         required: true
@@ -109,20 +109,28 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_pd_server_pd01_port:
+    - dependency_pd_server_pd01_port_0:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_pd_server_pd01_port:
+    - link_pd_server_pd01_port_0:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
         - 1
         - 1
     capabilities:
+      binding_pd_server_pd01_port_0:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
       scalable_pd_server:
         type: tosca.capabilities.Scalable
         occurrences:
@@ -152,12 +160,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_pd_server_pd01_port:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
       os_pd_server:
         type: tosca.capabilities.OperatingSystem
         occurrences:
@@ -169,12 +171,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_pd_server_pd01_port:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
       cpu_pd_server:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -205,7 +201,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_pd_server_pd01_port:
+      network.incoming.packets_pd_server_pd01_port_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -229,7 +225,19 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_pd_server_pd01_port:
+      network.incoming.packets.rate_pd_server_pd01_port_0:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.incoming.bytes.rate_pd_server_pd01_port_0:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.outgoing.packets.rate_pd_server_pd01_port_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -247,6 +255,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      attachment_pd_server_pd01_port_0:
+        type: tosca.capabilities.Attachment
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.write.requests_pd_server:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -258,17 +271,17 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_pd_server_pd01_port:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
       disk.capacity_pd_server:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pd_server_pd01_port_0:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.allocation_pd_server:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -292,6 +305,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      network.outgoing.bytes.rate_pd_server_pd01_port_0:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
       feature_pd_server:
         type: tosca.capabilities.Node
         occurrences:
@@ -303,27 +322,19 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      binding_pd_server_pd01_port:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface
-        occurrences:
-        - 0
-        - UNBOUNDED
       disk.write.bytes_pd_server:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_pd_server_pd01_port:
+      network.outgoing.bytes_pd_server_pd01_port_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_pd_server_pd01_port:
+      network.incoming.bytes_pd_server_pd01_port_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -353,6 +364,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      network.outpoing.packets_pd_server_pd01_port_0:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.read.requests_pd_server:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -372,14 +389,8 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_pd_server_pd01_port:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
-      forwarder_pd_server_pd01_port:
-        type: org.openecomp.capabilities.Forwarder
+      feature_pd_server_pd01_port_0:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
@@ -401,11 +412,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      feature_pd_server_pd01_port:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
       disk.device.latency_pd_server:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -424,12 +430,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_pd_server_pd01_port:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
       disk.device.iops_pd_server:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -445,7 +445,7 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      port_ps01_port_subnetpoolid:
+      port_ps01_port_0_network_role:
         type: string
         required: true
         status: SUPPORTED
@@ -461,6 +461,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_ps01_port_0_network:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
@@ -469,7 +475,13 @@ node_types:
         status: SUPPORTED
         constraints:
         - greater_or_equal: 0
-      port_ps01_port_vlan_requirements:
+      port_ps01_port_0_ip_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.IpRequirements
+      port_ps01_port_0_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
@@ -479,13 +491,11 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
-      port_ps01_port_related_networks:
-        type: list
+      port_ps01_port_0_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
-      port_ps01_port_order:
+      port_ps01_port_0_order:
         type: integer
         required: true
         status: SUPPORTED
@@ -493,80 +503,64 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
-      port_ps01_port_network_role:
+      port_ps01_port_0_network_role_tag:
         type: string
         required: true
         status: SUPPORTED
-      port_ps01_port_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
+      port_ps01_port_0_exCP_naming:
+        type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
-      port_ps01_port_network:
-        type: list
+      port_ps01_port_0_subnetpoolid:
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
-      port_ps01_port_ip_requirements:
+      port_ps01_port_0_related_networks:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
-      port_ps01_port_network_role_tag:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_ps01_port_exCP_naming:
-        type: org.openecomp.datatypes.Naming
-        required: true
-        status: SUPPORTED
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     attributes:
       ps_server_accessIPv4:
         type: string
         status: SUPPORTED
     requirements:
-    - dependency_ps_server:
+    - dependency_ps_server_ps01_port_0:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - local_storage_ps_server:
-        capability: tosca.capabilities.Attachment
-        node: tosca.nodes.BlockStorage
-        relationship: tosca.relationships.AttachesTo
+    - link_ps_server_ps01_port_0:
+        capability: tosca.capabilities.network.Linkable
+        relationship: tosca.relationships.network.LinksTo
         occurrences:
-        - 0
-        - UNBOUNDED
-    - dependency_ps_server_ps01_port:
+        - 1
+        - 1
+    - dependency_ps_server:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_ps_server_ps01_port:
-        capability: tosca.capabilities.network.Linkable
-        relationship: tosca.relationships.network.LinksTo
-        occurrences:
-        - 1
-        - 1
-    capabilities:
-      network.incoming.packets.rate_ps_server_ps01_port:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+    - local_storage_ps_server:
+        capability: tosca.capabilities.Attachment
+        node: tosca.nodes.BlockStorage
+        relationship: tosca.relationships.AttachesTo
         occurrences:
-        - 1
+        - 0
         - UNBOUNDED
+    capabilities:
       instance_ps_server:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_ps_server_ps01_port:
+      network.incoming.packets_ps_server_ps01_port_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -579,12 +573,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_ps_server_ps01_port:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
       cpu.delta_ps_server:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -597,12 +585,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      feature_ps_server_ps01_port:
+      feature_ps_server:
         type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      feature_ps_server:
+      feature_ps_server_ps01_port_0:
         type: tosca.capabilities.Node
         occurrences:
         - 1
@@ -649,12 +637,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_ps_server_ps01_port:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
       disk.device.latency_ps_server:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -720,19 +702,19 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_util_ps_server:
+      network.outpoing.packets_ps_server_ps01_port_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      memory.resident_ps_server:
+      cpu_util_ps_server:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_ps_server_ps01_port:
+      memory.resident_ps_server:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -750,7 +732,13 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_ps_server_ps01_port:
+      network.incoming.bytes_ps_server_ps01_port_0:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.outgoing.bytes.rate_ps_server_ps01_port_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -785,11 +773,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_ps_server_ps01_port:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
       os_ps_server:
         type: tosca.capabilities.OperatingSystem
         occurrences:
@@ -801,7 +784,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      binding_ps_server_ps01_port:
+      binding_ps_server_ps01_port_0:
         type: tosca.capabilities.network.Bindable
         valid_source_types:
         - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
@@ -809,7 +792,7 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-      forwarder_ps_server_ps01_port:
+      forwarder_ps_server_ps01_port_0:
         type: org.openecomp.capabilities.Forwarder
         occurrences:
         - 1
@@ -826,6 +809,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      attachment_ps_server_ps01_port_0:
+        type: tosca.capabilities.Attachment
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.usage_ps_server:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -849,7 +837,13 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_ps_server_ps01_port:
+      network.outgoing.bytes_ps_server_ps01_port_0:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.outgoing.packets.rate_ps_server_ps01_port_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -861,9 +855,15 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_ps_server_ps01_port:
+      network.incoming.packets.rate_ps_server_ps01_port_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
-        - UNBOUNDED
\ No newline at end of file
+        - UNBOUNDED
+      network.incoming.bytes.rate_ps_server_ps01_port_0:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/MainServiceTemplate.yaml
index 4d445e467c..6f9a2ce876 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/MainServiceTemplate.yaml
@@ -683,6 +683,18 @@ topology_template:
       directives:
       - substitutable
       properties:
+        port_pd01_port_0_mac_requirements:
+          mac_count_required:
+            is_required: false
+        port_pd01_port_0_network:
+        - get_input: oam_net_name
+        port_pd01_port_0_ip_requirements:
+        - ip_version: 4
+          ip_count_required:
+            is_required: false
+          floating_ip_count_required:
+            is_required: false
+        port_pd01_port_0_network_role_tag: oam
         compute_pd_server_availability_zone:
         - get_input: availabilityzone_name
         compute_pd_server_name:
@@ -691,22 +703,10 @@ topology_template:
           - 0
         vm_flavor_name:
           get_input: pd_flavor_name
-        port_pd01_port_mac_requirements:
-          mac_count_required:
-            is_required: false
         vm_image_name:
           get_attribute:
           - abstract_ps_server
           - ps_server_accessIPv4
-        port_pd01_port_ip_requirements:
-        - ip_version: 4
-          ip_count_required:
-            is_required: false
-          floating_ip_count_required:
-            is_required: false
-        port_pd01_port_network:
-        - get_input: oam_net_name
-        port_pd01_port_network_role_tag: oam
         compute_pd_server_user_data_format:
         - RAW
         service_template_filter:
@@ -730,24 +730,24 @@ topology_template:
         - get_input: availabilityzone_name
         compute_ps_server_user_data_format:
         - RAW
-        vm_flavor_name:
-          get_input: pd_flavor_name
-        vm_image_name:
-          get_attribute:
-          - abstract_pd_server
-          - pd_server_accessIPv4
-        port_ps01_port_mac_requirements:
-          mac_count_required:
-            is_required: false
-        port_ps01_port_network:
+        port_ps01_port_0_network:
         - get_input: oam_net_name
-        port_ps01_port_ip_requirements:
+        port_ps01_port_0_ip_requirements:
         - ip_version: 4
           ip_count_required:
             is_required: false
           floating_ip_count_required:
             is_required: false
-        port_ps01_port_network_role_tag: oam
+        vm_flavor_name:
+          get_input: pd_flavor_name
+        port_ps01_port_0_mac_requirements:
+          mac_count_required:
+            is_required: false
+        vm_image_name:
+          get_attribute:
+          - abstract_pd_server
+          - pd_server_accessIPv4
+        port_ps01_port_0_network_role_tag: oam
         service_template_filter:
           substitute_service_template: Nested_ps_serverServiceTemplate.yaml
           count: 1
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/Nested_pd_serverServiceTemplate.yaml
index e0f1093cd2..f6a610a7ed 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/Nested_pd_serverServiceTemplate.yaml
@@ -11,67 +11,67 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
-    index_value:
-      type: integer
-      description: Index value of this substitution service template runtime instance
-      required: false
-      default: 0
-      constraints:
-      - greater_or_equal: 0
-    compute_pd_server_availability_zone:
-      type: list
+    port_pd01_port_0_mac_requirements:
+      type: org.openecomp.datatypes.network.MacRequirements
       required: true
-      entry_schema:
-        type: string
-    compute_pd_server_name:
+    port_pd01_port_0_network:
       type: list
       required: true
       entry_schema:
         type: string
-    port_pd01_port_exCP_naming:
-      type: org.openecomp.datatypes.Naming
-      required: true
-    port_pd01_port_related_networks:
+    port_pd01_port_0_ip_requirements:
       type: list
       required: true
       entry_schema:
-        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
-    vm_flavor_name:
+        type: org.openecomp.datatypes.network.IpRequirements
+    port_pd01_port_0_network_role_tag:
       type: string
       required: true
-    port_pd01_port_mac_requirements:
-      type: org.openecomp.datatypes.network.MacRequirements
-      required: true
-    vm_image_name:
+    port_pd01_port_0_network_role:
       type: string
       required: true
-    port_pd01_port_ip_requirements:
+    port_pd01_port_0_related_networks:
       type: list
       required: true
       entry_schema:
-        type: org.openecomp.datatypes.network.IpRequirements
-    port_pd01_port_network:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+    index_value:
+      type: integer
+      description: Index value of this substitution service template runtime instance
+      required: false
+      default: 0
+      constraints:
+      - greater_or_equal: 0
+    compute_pd_server_availability_zone:
       type: list
       required: true
       entry_schema:
         type: string
-    port_pd01_port_order:
-      type: integer
+    compute_pd_server_name:
+      type: list
       required: true
-    port_pd01_port_subnetpoolid:
+      entry_schema:
+        type: string
+    vm_flavor_name:
       type: string
       required: true
-    port_pd01_port_network_role:
-      type: string
+    port_pd01_port_0_exCP_naming:
+      type: org.openecomp.datatypes.Naming
+      required: true
+    port_pd01_port_0_order:
+      type: integer
       required: true
-    port_pd01_port_network_role_tag:
+    vm_image_name:
       type: string
       required: true
-    port_pd01_port_vlan_requirements:
+    port_pd01_port_0_vlan_requirements:
       type: list
       required: true
       entry_schema:
         type: org.openecomp.datatypes.network.VlanRequirements
+    port_pd01_port_0_subnetpoolid:
+      type: string
+      required: true
     compute_pd_server_user_data_format:
       type: list
       required: true
@@ -97,31 +97,31 @@ topology_template:
           get_input:
           - compute_pd_server_user_data_format
           - index_value
-    pd_server_pd01_port:
+    pd_server_pd01_port_0:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         exCP_naming:
-          get_input: port_pd01_port_exCP_naming
+          get_input: port_pd01_port_0_exCP_naming
         vlan_requirements:
-          get_input: port_pd01_port_vlan_requirements
+          get_input: port_pd01_port_0_vlan_requirements
         subinterface_indicator: false
         related_networks:
-          get_input: port_pd01_port_related_networks
+          get_input: port_pd01_port_0_related_networks
         ip_requirements:
-          get_input: port_pd01_port_ip_requirements
+          get_input: port_pd01_port_0_ip_requirements
         network_role_tag:
-          get_input: port_pd01_port_network_role_tag
+          get_input: port_pd01_port_0_network_role_tag
         mac_requirements:
-          get_input: port_pd01_port_mac_requirements
+          get_input: port_pd01_port_0_mac_requirements
         order:
-          get_input: port_pd01_port_order
+          get_input: port_pd01_port_0_order
         network_role:
-          get_input: port_pd01_port_network_role
+          get_input: port_pd01_port_0_network_role
         subnetpoolid:
-          get_input: port_pd01_port_subnetpoolid
+          get_input: port_pd01_port_0_subnetpoolid
         network:
           get_input:
-          - port_pd01_port_network
+          - port_pd01_port_0_network
           - index_value
       requirements:
       - binding:
@@ -138,6 +138,9 @@ topology_template:
   substitution_mappings:
     node_type: org.openecomp.resource.abstract.nodes.pd_server
     capabilities:
+      binding_pd_server_pd01_port_0:
+      - pd_server_pd01_port_0
+      - binding
       scalable_pd_server:
       - pd_server
       - scalable
@@ -153,18 +156,12 @@ 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
       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
@@ -180,9 +177,9 @@ 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
+      network.incoming.packets_pd_server_pd01_port_0:
+      - pd_server_pd01_port_0
+      - network.incoming.packets
       disk.iops_pd_server:
       - pd_server
       - disk.iops
@@ -192,27 +189,36 @@ topology_template:
       cpu.delta_pd_server:
       - pd_server
       - cpu.delta
-      network.incoming.packets.rate_pd_server_pd01_port:
-      - pd_server_pd01_port
+      network.incoming.packets.rate_pd_server_pd01_port_0:
+      - pd_server_pd01_port_0
       - network.incoming.packets.rate
+      network.incoming.bytes.rate_pd_server_pd01_port_0:
+      - pd_server_pd01_port_0
+      - network.incoming.bytes.rate
+      network.outgoing.packets.rate_pd_server_pd01_port_0:
+      - pd_server_pd01_port_0
+      - network.outgoing.packets.rate
       vcpus_pd_server:
       - pd_server
       - vcpus
       disk.device.write.bytes.rate_pd_server:
       - pd_server
       - disk.device.write.bytes.rate
+      attachment_pd_server_pd01_port_0:
+      - pd_server_pd01_port_0
+      - attachment
       disk.device.write.requests_pd_server:
       - pd_server
       - disk.device.write.requests
       endpoint_pd_server:
       - pd_server
       - endpoint
-      attachment_pd_server_pd01_port:
-      - pd_server_pd01_port
-      - attachment
       disk.capacity_pd_server:
       - pd_server
       - disk.capacity
+      forwarder_pd_server_pd01_port_0:
+      - pd_server_pd01_port_0
+      - forwarder
       disk.device.allocation_pd_server:
       - pd_server
       - disk.device.allocation
@@ -225,24 +231,24 @@ topology_template:
       disk.read.requests_pd_server:
       - pd_server
       - disk.read.requests
+      network.outgoing.bytes.rate_pd_server_pd01_port_0:
+      - pd_server_pd01_port_0
+      - network.outgoing.bytes.rate
       feature_pd_server:
       - pd_server
       - feature
       disk.usage_pd_server:
       - pd_server
       - disk.usage
-      binding_pd_server_pd01_port:
-      - pd_server_pd01_port
-      - binding
       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
+      network.outgoing.bytes_pd_server_pd01_port_0:
+      - pd_server_pd01_port_0
+      - network.outgoing.bytes
+      network.incoming.bytes_pd_server_pd01_port_0:
+      - pd_server_pd01_port_0
+      - network.incoming.bytes
       disk.device.read.requests.rate_pd_server:
       - pd_server
       - disk.device.read.requests.rate
@@ -255,6 +261,9 @@ topology_template:
       disk.device.write.bytes_pd_server:
       - pd_server
       - disk.device.write.bytes
+      network.outpoing.packets_pd_server_pd01_port_0:
+      - pd_server_pd01_port_0
+      - network.outpoing.packets
       disk.device.read.requests_pd_server:
       - pd_server
       - disk.device.read.requests
@@ -264,12 +273,9 @@ 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_pd01_port_0:
+      - pd_server_pd01_port_0
+      - feature
       disk.write.requests.rate_pd_server:
       - pd_server
       - disk.write.requests.rate
@@ -279,9 +285,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
@@ -291,9 +294,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
@@ -301,12 +301,12 @@ topology_template:
       local_storage_pd_server:
       - pd_server
       - local_storage
-      link_pd_server_pd01_port:
-      - pd_server_pd01_port
-      - 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_pd01_port_0:
+      - pd_server_pd01_port_0
+      - dependency
+      link_pd_server_pd01_port_0:
+      - pd_server_pd01_port_0
+      - link
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/Nested_ps_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/Nested_ps_serverServiceTemplate.yaml
index 4b513cac7f..76bdc2b7c1 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/Nested_ps_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/Nested_ps_serverServiceTemplate.yaml
@@ -16,7 +16,7 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    port_ps01_port_subnetpoolid:
+    port_ps01_port_0_network_role:
       type: string
       required: true
     compute_ps_server_availability_zone:
@@ -29,6 +29,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_ps01_port_0_network:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     index_value:
       type: integer
       description: Index value of this substitution service template runtime instance
@@ -36,7 +41,12 @@ topology_template:
       default: 0
       constraints:
       - greater_or_equal: 0
-    port_ps01_port_vlan_requirements:
+    port_ps01_port_0_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.IpRequirements
+    port_ps01_port_0_vlan_requirements:
       type: list
       required: true
       entry_schema:
@@ -44,90 +54,80 @@ topology_template:
     vm_flavor_name:
       type: string
       required: true
-    port_ps01_port_related_networks:
-      type: list
+    port_ps01_port_0_mac_requirements:
+      type: org.openecomp.datatypes.network.MacRequirements
       required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
-    port_ps01_port_order:
+    port_ps01_port_0_order:
       type: integer
       required: true
     vm_image_name:
       type: string
       required: true
-    port_ps01_port_network_role:
+    port_ps01_port_0_network_role_tag:
       type: string
       required: true
-    port_ps01_port_mac_requirements:
-      type: org.openecomp.datatypes.network.MacRequirements
+    port_ps01_port_0_exCP_naming:
+      type: org.openecomp.datatypes.Naming
       required: true
-    port_ps01_port_network:
-      type: list
+    port_ps01_port_0_subnetpoolid:
+      type: string
       required: true
-      entry_schema:
-        type: string
-    port_ps01_port_ip_requirements:
+    port_ps01_port_0_related_networks:
       type: list
       required: true
       entry_schema:
-        type: org.openecomp.datatypes.network.IpRequirements
-    port_ps01_port_network_role_tag:
-      type: string
-      required: true
-    port_ps01_port_exCP_naming:
-      type: org.openecomp.datatypes.Naming
-      required: true
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
   node_templates:
-    ps_server:
-      type: org.openecomp.resource.vfc.compute.nodes.heat.ps_server
-      properties:
-        availability_zone:
-          get_input:
-          - compute_ps_server_availability_zone
-          - index_value
-        flavor:
-          get_input: vm_flavor_name
-        image:
-          get_input: vm_image_name
-        name:
-          get_input:
-          - compute_ps_server_name
-          - index_value
-        user_data_format:
-          get_input:
-          - compute_ps_server_user_data_format
-          - index_value
-    ps_server_ps01_port:
+    ps_server_ps01_port_0:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         exCP_naming:
-          get_input: port_ps01_port_exCP_naming
+          get_input: port_ps01_port_0_exCP_naming
         vlan_requirements:
-          get_input: port_ps01_port_vlan_requirements
+          get_input: port_ps01_port_0_vlan_requirements
         subinterface_indicator: false
         related_networks:
-          get_input: port_ps01_port_related_networks
+          get_input: port_ps01_port_0_related_networks
         ip_requirements:
-          get_input: port_ps01_port_ip_requirements
+          get_input: port_ps01_port_0_ip_requirements
         network_role_tag:
-          get_input: port_ps01_port_network_role_tag
+          get_input: port_ps01_port_0_network_role_tag
         mac_requirements:
-          get_input: port_ps01_port_mac_requirements
+          get_input: port_ps01_port_0_mac_requirements
         order:
-          get_input: port_ps01_port_order
+          get_input: port_ps01_port_0_order
         network_role:
-          get_input: port_ps01_port_network_role
+          get_input: port_ps01_port_0_network_role
         subnetpoolid:
-          get_input: port_ps01_port_subnetpoolid
+          get_input: port_ps01_port_0_subnetpoolid
         network:
           get_input:
-          - port_ps01_port_network
+          - port_ps01_port_0_network
           - index_value
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
           node: ps_server
           relationship: tosca.relationships.network.BindsTo
+    ps_server:
+      type: org.openecomp.resource.vfc.compute.nodes.heat.ps_server
+      properties:
+        availability_zone:
+          get_input:
+          - compute_ps_server_availability_zone
+          - index_value
+        flavor:
+          get_input: vm_flavor_name
+        image:
+          get_input: vm_image_name
+        name:
+          get_input:
+          - compute_ps_server_name
+          - index_value
+        user_data_format:
+          get_input:
+          - compute_ps_server_user_data_format
+          - index_value
   outputs:
     ps_server_accessIPv4:
       type: string
@@ -138,33 +138,27 @@ topology_template:
   substitution_mappings:
     node_type: org.openecomp.resource.abstract.nodes.ps_server
     capabilities:
-      network.incoming.packets.rate_ps_server_ps01_port:
-      - ps_server_ps01_port
-      - network.incoming.packets.rate
       instance_ps_server:
       - ps_server
       - instance
-      network.outpoing.packets_ps_server_ps01_port:
-      - ps_server_ps01_port
-      - network.outpoing.packets
+      network.incoming.packets_ps_server_ps01_port_0:
+      - ps_server_ps01_port_0
+      - network.incoming.packets
       host_ps_server:
       - ps_server
       - host
-      network.incoming.packets_ps_server_ps01_port:
-      - ps_server_ps01_port
-      - network.incoming.packets
       cpu.delta_ps_server:
       - ps_server
       - cpu.delta
       disk.write.bytes.rate_ps_server:
       - ps_server
       - disk.write.bytes.rate
-      feature_ps_server_ps01_port:
-      - ps_server_ps01_port
-      - feature
       feature_ps_server:
       - ps_server
       - feature
+      feature_ps_server_ps01_port_0:
+      - ps_server_ps01_port_0
+      - feature
       disk.root.size_ps_server:
       - ps_server
       - disk.root.size
@@ -186,9 +180,6 @@ topology_template:
       disk.device.iops_ps_server:
       - ps_server
       - disk.device.iops
-      network.outgoing.packets.rate_ps_server_ps01_port:
-      - ps_server_ps01_port
-      - network.outgoing.packets.rate
       disk.device.latency_ps_server:
       - ps_server
       - disk.device.latency
@@ -222,23 +213,26 @@ topology_template:
       disk.device.read.bytes.rate_ps_server:
       - ps_server
       - disk.device.read.bytes.rate
+      network.outpoing.packets_ps_server_ps01_port_0:
+      - ps_server_ps01_port_0
+      - network.outpoing.packets
       cpu_util_ps_server:
       - ps_server
       - cpu_util
       memory.resident_ps_server:
       - ps_server
       - memory.resident
-      network.incoming.bytes_ps_server_ps01_port:
-      - ps_server_ps01_port
-      - network.incoming.bytes
       disk.device.read.requests_ps_server:
       - ps_server
       - disk.device.read.requests
       disk.write.bytes_ps_server:
       - ps_server
       - disk.write.bytes
-      network.outgoing.bytes.rate_ps_server_ps01_port:
-      - ps_server_ps01_port
+      network.incoming.bytes_ps_server_ps01_port_0:
+      - ps_server_ps01_port_0
+      - network.incoming.bytes
+      network.outgoing.bytes.rate_ps_server_ps01_port_0:
+      - ps_server_ps01_port_0
       - network.outgoing.bytes.rate
       disk.device.write.requests.rate_ps_server:
       - ps_server
@@ -255,20 +249,17 @@ topology_template:
       binding_ps_server:
       - ps_server
       - binding
-      attachment_ps_server_ps01_port:
-      - ps_server_ps01_port
-      - attachment
       os_ps_server:
       - ps_server
       - os
       disk.device.usage_ps_server:
       - ps_server
       - disk.device.usage
-      binding_ps_server_ps01_port:
-      - ps_server_ps01_port
+      binding_ps_server_ps01_port_0:
+      - ps_server_ps01_port_0
       - binding
-      forwarder_ps_server_ps01_port:
-      - ps_server_ps01_port
+      forwarder_ps_server_ps01_port_0:
+      - ps_server_ps01_port_0
       - forwarder
       disk.device.write.bytes.rate_ps_server:
       - ps_server
@@ -276,6 +267,9 @@ topology_template:
       vcpus_ps_server:
       - ps_server
       - vcpus
+      attachment_ps_server_ps01_port_0:
+      - ps_server_ps01_port_0
+      - attachment
       disk.usage_ps_server:
       - ps_server
       - disk.usage
@@ -288,25 +282,31 @@ topology_template:
       disk.capacity_ps_server:
       - ps_server
       - disk.capacity
-      network.incoming.bytes.rate_ps_server_ps01_port:
-      - ps_server_ps01_port
-      - network.incoming.bytes.rate
+      network.outgoing.bytes_ps_server_ps01_port_0:
+      - ps_server_ps01_port_0
+      - network.outgoing.bytes
+      network.outgoing.packets.rate_ps_server_ps01_port_0:
+      - ps_server_ps01_port_0
+      - network.outgoing.packets.rate
       disk.device.allocation_ps_server:
       - ps_server
       - disk.device.allocation
-      network.outgoing.bytes_ps_server_ps01_port:
-      - ps_server_ps01_port
-      - network.outgoing.bytes
+      network.incoming.packets.rate_ps_server_ps01_port_0:
+      - ps_server_ps01_port_0
+      - network.incoming.packets.rate
+      network.incoming.bytes.rate_ps_server_ps01_port_0:
+      - ps_server_ps01_port_0
+      - network.incoming.bytes.rate
     requirements:
       dependency_ps_server:
       - ps_server
       - dependency
-      link_ps_server_ps01_port:
-      - ps_server_ps01_port
-      - link
-      dependency_ps_server_ps01_port:
-      - ps_server_ps01_port
+      dependency_ps_server_ps01_port_0:
+      - ps_server_ps01_port_0
       - dependency
+      link_ps_server_ps01_port_0:
+      - ps_server_ps01_port_0
+      - link
       local_storage_ps_server:
       - ps_server
-      - local_storage
\ No newline at end of file
+      - local_storage