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>

6 files changed, 506 insertions, 506 deletions

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/in/hot-mog-0108-bs1271.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/in/hot-mog-0108-bs1271.yml
index 9f4c7475d8..8401b6f3ce 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/in/hot-mog-0108-bs1271.yml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/in/hot-mog-0108-bs1271.yml
@@ -90,7 +90,7 @@ resources:
       flavor: {get_attr: [network_policy_server, name]}
       availability_zone: {get_param: availabilityzone_name}
       networks:
-        - port: {get_resource: pd01_port_0}
+        - port: {get_resource: ps_server_0_oam_port_0}
       user_data_format:  RAW
 
   server_pd_01:
@@ -102,7 +102,7 @@ resources:
       flavor: {get_attr: [network_policy_server, name]}
       availability_zone: {get_param: availabilityzone_name}
       networks:
-        - port: {get_resource: pd01_port_1}
+        - port: {get_resource: pd_server_0_oam_port_0}
       user_data_format:  RAW
 
   server_oam_01:
@@ -114,18 +114,18 @@ resources:
       flavor: {get_attr: [network_policy_server, name]}
       availability_zone: {get_param: availabilityzone_name}
       networks:
-        - port: {get_resource: pd01_port_2}
+        - port: {get_resource: oam_server_0_oam_port_0}
       user_data_format:  RAW
 
-  pd01_port_0:
+  ps_server_0_oam_port_0:
     type: OS::Neutron::Port
     properties:
       network: {get_attr: [network_policy_server, name]}
-  pd01_port_1:
+  pd_server_0_oam_port_0:
     type: OS::Neutron::Port
     properties:
       network: {get_param: oam_net_name}
-  pd01_port_2:
+  oam_server_0_oam_port_0:
     type: OS::Neutron::Port
     properties:
       network: {get_param: oam_net_name}
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 26ddce2ded..f0fa48a8bd 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -8,6 +8,14 @@ node_types:
   org.openecomp.resource.abstract.nodes.pd_server:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
+      port_pd_server_oam_port_0_exCP_naming:
+        type: org.openecomp.datatypes.Naming
+        required: true
+        status: SUPPORTED
+      port_pd_server_oam_port_0_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
+        required: true
+        status: SUPPORTED
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
@@ -28,62 +36,54 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      port_pd01_port_exCP_naming:
-        type: org.openecomp.datatypes.Naming
+      port_pd_server_oam_port_0_network_role:
+        type: string
+        required: true
+        status: SUPPORTED
+      vm_flavor_name:
+        type: string
         required: true
         status: SUPPORTED
-      port_pd01_port_related_networks:
+      port_pd_server_oam_port_0_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
-      vm_flavor_name:
+          type: org.openecomp.datatypes.network.VlanRequirements
+      port_pd_server_oam_port_0_subnetpoolid:
         type: string
         required: true
         status: SUPPORTED
-      port_pd01_port_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
+      port_pd_server_oam_port_0_related_networks:
+        type: list
         required: true
         status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vm_image_name:
         type: string
         required: true
         status: SUPPORTED
-      port_pd01_port_ip_requirements:
+      port_pd_server_oam_port_0_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
-      port_pd01_port_network:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: string
-      port_pd01_port_order:
+      port_pd_server_oam_port_0_order:
         type: integer
         required: true
         status: SUPPORTED
-      port_pd01_port_subnetpoolid:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_pd01_port_network_role:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_pd01_port_network_role_tag:
+      port_pd_server_oam_port_0_network_role_tag:
         type: string
         required: true
         status: SUPPORTED
-      port_pd01_port_vlan_requirements:
+      port_pd_server_oam_port_0_network:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
+          type: string
       compute_pd_server_user_data_format:
         type: list
         required: true
@@ -105,20 +105,25 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_pd_server_pd01_port:
+    - dependency_pd_server_pd_server_oam_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_pd_server_oam_port_0:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
         - 1
         - 1
     capabilities:
+      feature_pd_server_pd_server_oam_port_0:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
       scalable_pd_server:
         type: tosca.capabilities.Scalable
         occurrences:
@@ -130,25 +135,25 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      memory.usage_pd_server:
+      network.outpoing.packets_pd_server_pd_server_oam_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_pd_server:
+      memory.usage_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
-      disk.device.usage_pd_server:
+      memory_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.outgoing.packets.rate_pd_server_pd01_port:
+      disk.device.usage_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:
@@ -165,19 +170,27 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_pd_server_pd01_port:
+      binding_pd_server_pd_server_oam_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
+      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.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_pd_server:
+      cpu_util_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
-      cpu_util_pd_server:
+      network.incoming.bytes.rate_pd_server_pd_server_oam_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:
@@ -201,7 +214,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_pd_server_pd01_port:
+      network.incoming.bytes_pd_server_pd_server_oam_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:
@@ -225,25 +238,30 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_pd_server_pd01_port:
+      vcpus_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
-      vcpus_pd_server:
+      disk.device.write.bytes.rate_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
-      disk.device.write.bytes.rate_pd_server:
+      forwarder_pd_server_pd_server_oam_port_0:
+        type: org.openecomp.capabilities.Forwarder
+        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.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests_pd_server:
+      network.outgoing.packets.rate_pd_server_pd_server_oam_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:
@@ -254,12 +272,19 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_pd_server_pd01_port:
-        type: tosca.capabilities.Attachment
+      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
-      disk.capacity_pd_server:
+      network.outgoing.bytes_pd_server_pd_server_oam_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_pd_server_oam_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:
@@ -299,32 +324,12 @@ 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:
-        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:
-        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.rate_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.
@@ -368,24 +373,19 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_pd_server_pd01_port:
+      disk.write.requests.rate_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:
-        type: org.openecomp.capabilities.Forwarder
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.write.requests.rate_pd_server:
+      disk.ephemeral.size_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
-      disk.ephemeral.size_pd_server:
+      network.incoming.packets.rate_pd_server_pd_server_oam_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:
@@ -397,8 +397,9 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      feature_pd_server_pd01_port:
-        type: tosca.capabilities.Node
+      network.outgoing.bytes.rate_pd_server_pd_server_oam_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
@@ -420,21 +421,34 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_pd_server_pd01_port:
+      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.
         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.
+      attachment_pd_server_pd_server_oam_port_0:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
   org.openecomp.resource.abstract.nodes.oam_server:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
+      port_oam_server_oam_port_0_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
+        required: true
+        status: SUPPORTED
+      port_oam_server_oam_port_0_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.VlanRequirements
+      port_oam_server_oam_port_0_network_role_tag:
+        type: string
+        required: true
+        status: SUPPORTED
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
@@ -443,11 +457,7 @@ node_types:
         status: SUPPORTED
         constraints:
         - greater_or_equal: 0
-      port_pd01_port_exCP_naming:
-        type: org.openecomp.datatypes.Naming
-        required: true
-        status: SUPPORTED
-      port_pd01_port_related_networks:
+      port_oam_server_oam_port_0_related_networks:
         type: list
         required: true
         status: SUPPORTED
@@ -457,40 +467,40 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
-      port_pd01_port_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
-        required: true
-        status: SUPPORTED
-      compute_oam_server_availability_zone:
-        type: list
+      port_oam_server_oam_port_0_network_role:
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
-      vm_image_name:
-        type: string
+      port_oam_server_oam_port_0_exCP_naming:
+        type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
-      port_pd01_port_ip_requirements:
+      port_oam_server_oam_port_0_network:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
-      port_pd01_port_network:
+          type: string
+      compute_oam_server_availability_zone:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_pd01_port_order:
-        type: integer
+      vm_image_name:
+        type: string
         required: true
         status: SUPPORTED
-      port_pd01_port_subnetpoolid:
+      port_oam_server_oam_port_0_subnetpoolid:
         type: string
         required: true
         status: SUPPORTED
+      port_oam_server_oam_port_0_ip_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.IpRequirements
       compute_oam_server_user_data_format:
         type: list
         required: true
@@ -503,29 +513,19 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      port_pd01_port_network_role:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_pd01_port_network_role_tag:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_pd01_port_vlan_requirements:
-        type: list
+      port_oam_server_oam_port_0_order:
+        type: integer
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
     requirements:
-    - dependency_oam_server_pd01_port:
+    - dependency_oam_server_oam_server_oam_port_0:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_oam_server_pd01_port:
+    - link_oam_server_oam_server_oam_port_0:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
@@ -565,12 +565,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_oam_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
       feature_oam_server:
         type: tosca.capabilities.Node
         occurrences:
@@ -606,14 +600,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      binding_oam_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_oam_server:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -626,7 +612,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      forwarder_oam_server_pd01_port:
+      forwarder_oam_server_oam_server_oam_port_0:
         type: org.openecomp.capabilities.Forwarder
         occurrences:
         - 1
@@ -643,21 +629,20 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_oam_server_pd01_port:
+      disk.device.read.requests.rate_oam_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
-      disk.device.read.requests.rate_oam_server:
+      network.incoming.packets_oam_server_oam_server_oam_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.outpoing.packets_oam_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.
+      attachment_oam_server_oam_server_oam_port_0:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
@@ -673,12 +658,24 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      network.outgoing.bytes.rate_oam_server_oam_server_oam_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.write.requests.rate_oam_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_oam_server_oam_server_oam_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
       instance_oam_server:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -738,24 +735,19 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_oam_server_pd01_port:
+      disk.latency_oam_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
-      attachment_oam_server_pd01_port:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.latency_oam_server:
+      disk.read.requests_oam_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
-      disk.read.requests_oam_server:
+      network.outgoing.packets.rate_oam_server_oam_server_oam_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:
@@ -779,8 +771,9 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      feature_oam_server_pd01_port:
-        type: tosca.capabilities.Node
+      network.outgoing.bytes_oam_server_oam_server_oam_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
@@ -800,19 +793,19 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_oam_server_pd01_port:
+      disk.write.requests.rate_oam_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
-      disk.write.requests.rate_oam_server:
+      network.incoming.packets.rate_oam_server_oam_server_oam_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.rate_oam_server_pd01_port:
+      network.outpoing.packets_oam_server_oam_server_oam_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:
@@ -841,15 +834,14 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_oam_server_pd01_port:
+      network.incoming.bytes.rate_oam_server_oam_server_oam_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_oam_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.
+      feature_oam_server_oam_server_oam_port_0:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
@@ -859,6 +851,14 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      binding_oam_server_oam_server_oam_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
   org.openecomp.resource.abstract.nodes.ps_server:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
@@ -888,76 +888,63 @@ node_types:
         status: SUPPORTED
         constraints:
         - greater_or_equal: 0
-      port_pd01_port_exCP_naming:
-        type: org.openecomp.datatypes.Naming
-        required: true
-        status: SUPPORTED
-      port_pd01_port_related_networks:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
-      vm_flavor_name:
+      port_ps_server_oam_port_0_subnetpoolid:
         type: string
         required: true
         status: SUPPORTED
-      port_pd01_port_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
-        required: true
-        status: SUPPORTED
-      vm_image_name:
+      vm_flavor_name:
         type: string
         required: true
         status: SUPPORTED
-      port_pd01_port_ip_requirements:
+      port_ps_server_oam_port_0_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
-      port_pd01_port_network:
+      port_ps_server_oam_port_0_network:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_pd01_port_order:
-        type: integer
+      port_ps_server_oam_port_0_exCP_naming:
+        type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
-      port_pd01_port_subnetpoolid:
+      port_ps_server_oam_port_0_network_role:
         type: string
         required: true
         status: SUPPORTED
-      port_pd01_port_network_role:
+      port_ps_server_oam_port_0_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.VlanRequirements
+      vm_image_name:
         type: string
         required: true
         status: SUPPORTED
-      port_pd01_port_network_role_tag:
+      port_ps_server_oam_port_0_network_role_tag:
         type: string
         required: true
         status: SUPPORTED
-      port_pd01_port_vlan_requirements:
+      port_ps_server_oam_port_0_related_networks:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+      port_ps_server_oam_port_0_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
+        required: true
+        status: SUPPORTED
+      port_ps_server_oam_port_0_order:
+        type: integer
+        required: true
+        status: SUPPORTED
     requirements:
-    - dependency_ps_server_pd01_port:
-        capability: tosca.capabilities.Node
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.DependsOn
-        occurrences:
-        - 0
-        - UNBOUNDED
-    - link_ps_server_pd01_port:
-        capability: tosca.capabilities.network.Linkable
-        relationship: tosca.relationships.network.LinksTo
-        occurrences:
-        - 1
-        - 1
     - dependency_ps_server:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
@@ -972,6 +959,19 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
+    - dependency_ps_server_ps_server_oam_port_0:
+        capability: tosca.capabilities.Node
+        node: tosca.nodes.Root
+        relationship: tosca.relationships.DependsOn
+        occurrences:
+        - 0
+        - UNBOUNDED
+    - link_ps_server_ps_server_oam_port_0:
+        capability: tosca.capabilities.network.Linkable
+        relationship: tosca.relationships.network.LinksTo
+        occurrences:
+        - 1
+        - 1
     capabilities:
       instance_ps_server:
         type: org.openecomp.capabilities.metric.Ceilometer
@@ -979,13 +979,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      binding_ps_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
+      network.incoming.packets.rate_ps_server_ps_server_oam_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:
-        - 0
+        - 1
         - UNBOUNDED
       host_ps_server:
         type: tosca.capabilities.Container
@@ -1047,13 +1045,19 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.iops_ps_server:
+      network.outgoing.packets.rate_ps_server_ps_server_oam_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_ps_server_ps_server_oam_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.outpoing.packets_ps_server_pd01_port:
+      disk.device.iops_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:
@@ -1088,38 +1092,26 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_ps_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_ps_server_pd01_port:
-        type: org.openecomp.capabilities.Forwarder
-        occurrences:
-        - 1
-        - UNBOUNDED
       disk.write.requests_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.rate_ps_server_pd01_port:
+      network.outgoing.bytes_ps_server_ps_server_oam_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_ps_server_pd01_port:
+      disk.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.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.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.
+      feature_ps_server_ps_server_oam_port_0:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
@@ -1135,6 +1127,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_ps_server_ps_server_oam_port_0:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.iops_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.
@@ -1147,7 +1144,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_ps_server_pd01_port:
+      network.incoming.bytes_ps_server_ps_server_oam_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:
@@ -1177,21 +1174,25 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      feature_ps_server_pd01_port:
-        type: tosca.capabilities.Node
+      network.outpoing.packets_ps_server_ps_server_oam_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_pd01_port:
+      network.incoming.bytes.rate_ps_server_ps_server_oam_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
-      attachment_ps_server_pd01_port:
-        type: tosca.capabilities.Attachment
+      binding_ps_server_ps_server_oam_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:
-        - 1
+        - 0
         - UNBOUNDED
       disk.device.write.requests.rate_ps_server:
         type: org.openecomp.capabilities.metric.Ceilometer
@@ -1199,12 +1200,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_ps_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.read.requests_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.
@@ -1228,6 +1223,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      attachment_ps_server_ps_server_oam_port_0:
+        type: tosca.capabilities.Attachment
+        occurrences:
+        - 1
+        - UNBOUNDED
       os_ps_server:
         type: tosca.capabilities.OperatingSystem
         occurrences:
@@ -1251,12 +1251,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_ps_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.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.
@@ -1285,4 +1279,10 @@ node_types:
         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.outgoing.bytes.rate_ps_server_ps_server_oam_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/threeDiffComputesWithPorts/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/MainServiceTemplate.yaml
index 0bb61d1682..bf59f34752 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/MainServiceTemplate.yaml
@@ -327,6 +327,9 @@ topology_template:
       directives:
       - substitutable
       properties:
+        port_pd_server_oam_port_0_mac_requirements:
+          mac_count_required:
+            is_required: false
         compute_pd_server_availability_zone:
         - get_input: availabilityzone_name
         compute_pd_server_name:
@@ -337,20 +340,17 @@ topology_template:
           get_attribute:
           - network_policy_server
           - name
-        port_pd01_port_mac_requirements:
-          mac_count_required:
-            is_required: false
         vm_image_name:
           get_input: pd_image_name
-        port_pd01_port_ip_requirements:
+        port_pd_server_oam_port_0_ip_requirements:
         - ip_version: 4
           ip_count_required:
             is_required: false
           floating_ip_count_required:
             is_required: false
-        port_pd01_port_network:
+        port_pd_server_oam_port_0_network_role_tag: oam
+        port_pd_server_oam_port_0_network:
         - get_input: oam_net_name
-        port_pd01_port_network_role_tag: oam
         compute_pd_server_user_data_format:
         - RAW
         service_template_filter:
@@ -378,21 +378,21 @@ topology_template:
           get_attribute:
           - network_policy_server
           - name
-        port_pd01_port_mac_requirements:
-          mac_count_required:
-            is_required: false
-        vm_image_name:
-          get_input: pd_image_name
-        port_pd01_port_ip_requirements:
+        port_ps_server_oam_port_0_ip_requirements:
         - ip_version: 4
           ip_count_required:
             is_required: false
           floating_ip_count_required:
             is_required: false
-        port_pd01_port_network:
+        port_ps_server_oam_port_0_network:
         - get_attribute:
           - network_policy_server
           - name
+        vm_image_name:
+          get_input: pd_image_name
+        port_ps_server_oam_port_0_mac_requirements:
+          mac_count_required:
+            is_required: false
         service_template_filter:
           substitute_service_template: Nested_ps_serverServiceTemplate.yaml
           count: 1
@@ -406,32 +406,32 @@ topology_template:
       directives:
       - substitutable
       properties:
+        port_oam_server_oam_port_0_mac_requirements:
+          mac_count_required:
+            is_required: false
+        port_oam_server_oam_port_0_network_role_tag: oam
         vm_flavor_name:
           get_attribute:
           - network_policy_server
           - name
-        port_pd01_port_mac_requirements:
-          mac_count_required:
-            is_required: false
+        port_oam_server_oam_port_0_network:
+        - get_input: oam_net_name
         compute_oam_server_availability_zone:
         - get_input: availabilityzone_name
         vm_image_name:
           get_input: pd_image_name
-        port_pd01_port_ip_requirements:
+        port_oam_server_oam_port_0_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
         compute_oam_server_user_data_format:
         - RAW
         compute_oam_server_name:
         - get_input:
           - oam_server_names
           - 0
-        port_pd01_port_network_role_tag: oam
         service_template_filter:
           substitute_service_template: Nested_oam_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/threeDiffComputesWithPorts/out/Nested_oam_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/Nested_oam_serverServiceTemplate.yaml
index 2893981349..8c188adb4f 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/Nested_oam_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/Nested_oam_serverServiceTemplate.yaml
@@ -11,6 +11,17 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
+    port_oam_server_oam_port_0_mac_requirements:
+      type: org.openecomp.datatypes.network.MacRequirements
+      required: true
+    port_oam_server_oam_port_0_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.VlanRequirements
+    port_oam_server_oam_port_0_network_role_tag:
+      type: string
+      required: true
     index_value:
       type: integer
       description: Index value of this substitution service template runtime instance
@@ -18,10 +29,7 @@ topology_template:
       default: 0
       constraints:
       - greater_or_equal: 0
-    port_pd01_port_exCP_naming:
-      type: org.openecomp.datatypes.Naming
-      required: true
-    port_pd01_port_related_networks:
+    port_oam_server_oam_port_0_related_networks:
       type: list
       required: true
       entry_schema:
@@ -29,9 +37,17 @@ topology_template:
     vm_flavor_name:
       type: string
       required: true
-    port_pd01_port_mac_requirements:
-      type: org.openecomp.datatypes.network.MacRequirements
+    port_oam_server_oam_port_0_network_role:
+      type: string
+      required: true
+    port_oam_server_oam_port_0_exCP_naming:
+      type: org.openecomp.datatypes.Naming
+      required: true
+    port_oam_server_oam_port_0_network:
+      type: list
       required: true
+      entry_schema:
+        type: string
     compute_oam_server_availability_zone:
       type: list
       required: true
@@ -40,22 +56,14 @@ topology_template:
     vm_image_name:
       type: string
       required: true
-    port_pd01_port_ip_requirements:
-      type: list
+    port_oam_server_oam_port_0_subnetpoolid:
+      type: string
       required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.IpRequirements
-    port_pd01_port_network:
+    port_oam_server_oam_port_0_ip_requirements:
       type: list
       required: true
       entry_schema:
-        type: string
-    port_pd01_port_order:
-      type: integer
-      required: true
-    port_pd01_port_subnetpoolid:
-      type: string
-      required: true
+        type: org.openecomp.datatypes.network.IpRequirements
     compute_oam_server_user_data_format:
       type: list
       required: true
@@ -66,43 +74,35 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    port_pd01_port_network_role:
-      type: string
-      required: true
-    port_pd01_port_network_role_tag:
-      type: string
-      required: true
-    port_pd01_port_vlan_requirements:
-      type: list
+    port_oam_server_oam_port_0_order:
+      type: integer
       required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.VlanRequirements
   node_templates:
-    oam_server_pd01_port:
+    oam_server_oam_server_oam_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_oam_server_oam_port_0_exCP_naming
         vlan_requirements:
-          get_input: port_pd01_port_vlan_requirements
+          get_input: port_oam_server_oam_port_0_vlan_requirements
         subinterface_indicator: false
         related_networks:
-          get_input: port_pd01_port_related_networks
+          get_input: port_oam_server_oam_port_0_related_networks
         ip_requirements:
-          get_input: port_pd01_port_ip_requirements
+          get_input: port_oam_server_oam_port_0_ip_requirements
         network_role_tag:
-          get_input: port_pd01_port_network_role_tag
+          get_input: port_oam_server_oam_port_0_network_role_tag
         mac_requirements:
-          get_input: port_pd01_port_mac_requirements
+          get_input: port_oam_server_oam_port_0_mac_requirements
         order:
-          get_input: port_pd01_port_order
+          get_input: port_oam_server_oam_port_0_order
         network_role:
-          get_input: port_pd01_port_network_role
+          get_input: port_oam_server_oam_port_0_network_role
         subnetpoolid:
-          get_input: port_pd01_port_subnetpoolid
+          get_input: port_oam_server_oam_port_0_subnetpoolid
         network:
           get_input:
-          - port_pd01_port_network
+          - port_oam_server_oam_port_0_network
           - index_value
       requirements:
       - binding:
@@ -140,9 +140,6 @@ topology_template:
       disk.usage_oam_server:
       - oam_server
       - disk.usage
-      network.incoming.bytes.rate_oam_server_pd01_port:
-      - oam_server_pd01_port
-      - network.incoming.bytes.rate
       feature_oam_server:
       - oam_server
       - feature
@@ -161,17 +158,14 @@ topology_template:
       disk.read.bytes.rate_oam_server:
       - oam_server
       - disk.read.bytes.rate
-      binding_oam_server_pd01_port:
-      - oam_server_pd01_port
-      - binding
       disk.write.bytes_oam_server:
       - oam_server
       - disk.write.bytes
       disk.write.requests_oam_server:
       - oam_server
       - disk.write.requests
-      forwarder_oam_server_pd01_port:
-      - oam_server_pd01_port
+      forwarder_oam_server_oam_server_oam_port_0:
+      - oam_server_oam_server_oam_port_0
       - forwarder
       cpu_oam_server:
       - oam_server
@@ -179,24 +173,30 @@ topology_template:
       vcpus_oam_server:
       - oam_server
       - vcpus
-      network.incoming.packets_oam_server_pd01_port:
-      - oam_server_pd01_port
-      - network.incoming.packets
       disk.device.read.requests.rate_oam_server:
       - oam_server
       - disk.device.read.requests.rate
-      network.outpoing.packets_oam_server_pd01_port:
-      - oam_server_pd01_port
-      - network.outpoing.packets
+      network.incoming.packets_oam_server_oam_server_oam_port_0:
+      - oam_server_oam_server_oam_port_0
+      - network.incoming.packets
+      attachment_oam_server_oam_server_oam_port_0:
+      - oam_server_oam_server_oam_port_0
+      - attachment
       disk.allocation_oam_server:
       - oam_server
       - disk.allocation
       disk.write.bytes.rate_oam_server:
       - oam_server
       - disk.write.bytes.rate
+      network.outgoing.bytes.rate_oam_server_oam_server_oam_port_0:
+      - oam_server_oam_server_oam_port_0
+      - network.outgoing.bytes.rate
       disk.device.write.requests.rate_oam_server:
       - oam_server
       - disk.device.write.requests.rate
+      network.incoming.bytes_oam_server_oam_server_oam_port_0:
+      - oam_server_oam_server_oam_port_0
+      - network.incoming.bytes
       instance_oam_server:
       - oam_server
       - instance
@@ -227,18 +227,15 @@ topology_template:
       disk.device.usage_oam_server:
       - oam_server
       - disk.device.usage
-      network.outgoing.packets.rate_oam_server_pd01_port:
-      - oam_server_pd01_port
-      - network.outgoing.packets.rate
-      attachment_oam_server_pd01_port:
-      - oam_server_pd01_port
-      - attachment
       disk.latency_oam_server:
       - oam_server
       - disk.latency
       disk.read.requests_oam_server:
       - oam_server
       - disk.read.requests
+      network.outgoing.packets.rate_oam_server_oam_server_oam_port_0:
+      - oam_server_oam_server_oam_port_0
+      - network.outgoing.packets.rate
       disk.device.iops_oam_server:
       - oam_server
       - disk.device.iops
@@ -248,9 +245,9 @@ topology_template:
       disk.device.latency_oam_server:
       - oam_server
       - disk.device.latency
-      feature_oam_server_pd01_port:
-      - oam_server_pd01_port
-      - feature
+      network.outgoing.bytes_oam_server_oam_server_oam_port_0:
+      - oam_server_oam_server_oam_port_0
+      - network.outgoing.bytes
       memory.usage_oam_server:
       - oam_server
       - memory.usage
@@ -260,15 +257,15 @@ topology_template:
       scalable_oam_server:
       - oam_server
       - scalable
-      network.incoming.bytes_oam_server_pd01_port:
-      - oam_server_pd01_port
-      - network.incoming.bytes
       disk.write.requests.rate_oam_server:
       - oam_server
       - disk.write.requests.rate
-      network.incoming.packets.rate_oam_server_pd01_port:
-      - oam_server_pd01_port
+      network.incoming.packets.rate_oam_server_oam_server_oam_port_0:
+      - oam_server_oam_server_oam_port_0
       - network.incoming.packets.rate
+      network.outpoing.packets_oam_server_oam_server_oam_port_0:
+      - oam_server_oam_server_oam_port_0
+      - network.outpoing.packets
       disk.device.read.bytes.rate_oam_server:
       - oam_server
       - disk.device.read.bytes.rate
@@ -281,25 +278,28 @@ topology_template:
       disk.read.bytes_oam_server:
       - oam_server
       - disk.read.bytes
-      network.outgoing.bytes_oam_server_pd01_port:
-      - oam_server_pd01_port
-      - network.outgoing.bytes
-      network.outgoing.bytes.rate_oam_server_pd01_port:
-      - oam_server_pd01_port
-      - network.outgoing.bytes.rate
+      network.incoming.bytes.rate_oam_server_oam_server_oam_port_0:
+      - oam_server_oam_server_oam_port_0
+      - network.incoming.bytes.rate
+      feature_oam_server_oam_server_oam_port_0:
+      - oam_server_oam_server_oam_port_0
+      - feature
       disk.ephemeral.size_oam_server:
       - oam_server
       - disk.ephemeral.size
+      binding_oam_server_oam_server_oam_port_0:
+      - oam_server_oam_server_oam_port_0
+      - binding
     requirements:
-      link_oam_server_pd01_port:
-      - oam_server_pd01_port
+      link_oam_server_oam_server_oam_port_0:
+      - oam_server_oam_server_oam_port_0
       - link
-      dependency_oam_server_pd01_port:
-      - oam_server_pd01_port
-      - dependency
       local_storage_oam_server:
       - oam_server
       - local_storage
+      dependency_oam_server_oam_server_oam_port_0:
+      - oam_server_oam_server_oam_port_0
+      - dependency
       dependency_oam_server:
       - oam_server
-      - dependency
\ No newline at end of file
+      - dependency
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/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/threeDiffComputesWithPorts/out/Nested_pd_serverServiceTemplate.yaml
index 2d01270aaf..689b0bf80a 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/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/threeDiffComputesWithPorts/out/Nested_pd_serverServiceTemplate.yaml
@@ -11,6 +11,12 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
+    port_pd_server_oam_port_0_exCP_naming:
+      type: org.openecomp.datatypes.Naming
+      required: true
+    port_pd_server_oam_port_0_mac_requirements:
+      type: org.openecomp.datatypes.network.MacRequirements
+      required: true
     index_value:
       type: integer
       description: Index value of this substitution service template runtime instance
@@ -28,50 +34,44 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    port_pd01_port_exCP_naming:
-      type: org.openecomp.datatypes.Naming
+    port_pd_server_oam_port_0_network_role:
+      type: string
+      required: true
+    vm_flavor_name:
+      type: string
       required: true
-    port_pd01_port_related_networks:
+    port_pd_server_oam_port_0_vlan_requirements:
       type: list
       required: true
       entry_schema:
-        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
-    vm_flavor_name:
+        type: org.openecomp.datatypes.network.VlanRequirements
+    port_pd_server_oam_port_0_subnetpoolid:
       type: string
       required: true
-    port_pd01_port_mac_requirements:
-      type: org.openecomp.datatypes.network.MacRequirements
+    port_pd_server_oam_port_0_related_networks:
+      type: list
       required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     vm_image_name:
       type: string
       required: true
-    port_pd01_port_ip_requirements:
+    port_pd_server_oam_port_0_ip_requirements:
       type: list
       required: true
       entry_schema:
         type: org.openecomp.datatypes.network.IpRequirements
-    port_pd01_port_network:
-      type: list
-      required: true
-      entry_schema:
-        type: string
-    port_pd01_port_order:
+    port_pd_server_oam_port_0_order:
       type: integer
       required: true
-    port_pd01_port_subnetpoolid:
+    port_pd_server_oam_port_0_network_role_tag:
       type: string
       required: true
-    port_pd01_port_network_role:
-      type: string
-      required: true
-    port_pd01_port_network_role_tag:
-      type: string
-      required: true
-    port_pd01_port_vlan_requirements:
+    port_pd_server_oam_port_0_network:
       type: list
       required: true
       entry_schema:
-        type: org.openecomp.datatypes.network.VlanRequirements
+        type: string
     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_pd_server_oam_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_pd_server_oam_port_0_exCP_naming
         vlan_requirements:
-          get_input: port_pd01_port_vlan_requirements
+          get_input: port_pd_server_oam_port_0_vlan_requirements
         subinterface_indicator: false
         related_networks:
-          get_input: port_pd01_port_related_networks
+          get_input: port_pd_server_oam_port_0_related_networks
         ip_requirements:
-          get_input: port_pd01_port_ip_requirements
+          get_input: port_pd_server_oam_port_0_ip_requirements
         network_role_tag:
-          get_input: port_pd01_port_network_role_tag
+          get_input: port_pd_server_oam_port_0_network_role_tag
         mac_requirements:
-          get_input: port_pd01_port_mac_requirements
+          get_input: port_pd_server_oam_port_0_mac_requirements
         order:
-          get_input: port_pd01_port_order
+          get_input: port_pd_server_oam_port_0_order
         network_role:
-          get_input: port_pd01_port_network_role
+          get_input: port_pd_server_oam_port_0_network_role
         subnetpoolid:
-          get_input: port_pd01_port_subnetpoolid
+          get_input: port_pd_server_oam_port_0_subnetpoolid
         network:
           get_input:
-          - port_pd01_port_network
+          - port_pd_server_oam_port_0_network
           - index_value
       requirements:
       - binding:
@@ -131,12 +131,18 @@ topology_template:
   substitution_mappings:
     node_type: org.openecomp.resource.abstract.nodes.pd_server
     capabilities:
+      feature_pd_server_pd_server_oam_port_0:
+      - pd_server_pd_server_oam_port_0
+      - feature
       scalable_pd_server:
       - pd_server
       - scalable
       disk.read.bytes.rate_pd_server:
       - pd_server
       - disk.read.bytes.rate
+      network.outpoing.packets_pd_server_pd_server_oam_port_0:
+      - pd_server_pd_server_oam_port_0
+      - network.outpoing.packets
       memory.usage_pd_server:
       - pd_server
       - memory.usage
@@ -146,24 +152,24 @@ 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
+      binding_pd_server_pd_server_oam_port_0:
+      - pd_server_pd_server_oam_port_0
+      - binding
       cpu_pd_server:
       - pd_server
       - cpu
       cpu_util_pd_server:
       - pd_server
       - cpu_util
+      network.incoming.bytes.rate_pd_server_pd_server_oam_port_0:
+      - pd_server_pd_server_oam_port_0
+      - network.incoming.bytes.rate
       disk.device.write.requests.rate_pd_server:
       - pd_server
       - disk.device.write.requests.rate
@@ -173,9 +179,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.bytes_pd_server_pd_server_oam_port_0:
+      - pd_server_pd_server_oam_port_0
+      - network.incoming.bytes
       disk.iops_pd_server:
       - pd_server
       - disk.iops
@@ -185,27 +191,33 @@ 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
       vcpus_pd_server:
       - pd_server
       - vcpus
       disk.device.write.bytes.rate_pd_server:
       - pd_server
       - disk.device.write.bytes.rate
+      forwarder_pd_server_pd_server_oam_port_0:
+      - pd_server_pd_server_oam_port_0
+      - forwarder
       disk.device.write.requests_pd_server:
       - pd_server
       - disk.device.write.requests
+      network.outgoing.packets.rate_pd_server_pd_server_oam_port_0:
+      - pd_server_pd_server_oam_port_0
+      - network.outgoing.packets.rate
       endpoint_pd_server:
       - pd_server
       - endpoint
-      attachment_pd_server_pd01_port:
-      - pd_server_pd01_port
-      - attachment
       disk.capacity_pd_server:
       - pd_server
       - disk.capacity
+      network.outgoing.bytes_pd_server_pd_server_oam_port_0:
+      - pd_server_pd_server_oam_port_0
+      - network.outgoing.bytes
+      network.incoming.packets_pd_server_pd_server_oam_port_0:
+      - pd_server_pd_server_oam_port_0
+      - network.incoming.packets
       disk.device.allocation_pd_server:
       - pd_server
       - disk.device.allocation
@@ -224,18 +236,9 @@ topology_template:
       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
       disk.device.read.requests.rate_pd_server:
       - pd_server
       - disk.device.read.requests.rate
@@ -257,24 +260,21 @@ 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
       disk.write.requests.rate_pd_server:
       - pd_server
       - disk.write.requests.rate
       disk.ephemeral.size_pd_server:
       - pd_server
       - disk.ephemeral.size
+      network.incoming.packets.rate_pd_server_pd_server_oam_port_0:
+      - pd_server_pd_server_oam_port_0
+      - network.incoming.packets.rate
       disk.write.requests_pd_server:
       - pd_server
       - disk.write.requests
-      feature_pd_server_pd01_port:
-      - pd_server_pd01_port
-      - feature
+      network.outgoing.bytes.rate_pd_server_pd_server_oam_port_0:
+      - pd_server_pd_server_oam_port_0
+      - network.outgoing.bytes.rate
       disk.device.latency_pd_server:
       - pd_server
       - disk.device.latency
@@ -284,22 +284,22 @@ 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
+      attachment_pd_server_pd_server_oam_port_0:
+      - pd_server_pd_server_oam_port_0
+      - attachment
     requirements:
       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_pd_server_pd_server_oam_port_0:
+      - pd_server_pd_server_oam_port_0
       - dependency
       dependency_pd_server:
       - pd_server
-      - dependency
\ No newline at end of file
+      - dependency
+      link_pd_server_pd_server_oam_port_0:
+      - pd_server_pd_server_oam_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/threeDiffComputesWithPorts/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/threeDiffComputesWithPorts/out/Nested_ps_serverServiceTemplate.yaml
index 158f58ce62..6da2a82323 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/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/threeDiffComputesWithPorts/out/Nested_ps_serverServiceTemplate.yaml
@@ -33,110 +33,110 @@ topology_template:
       default: 0
       constraints:
       - greater_or_equal: 0
-    port_pd01_port_exCP_naming:
-      type: org.openecomp.datatypes.Naming
-      required: true
-    port_pd01_port_related_networks:
-      type: list
-      required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
-    vm_flavor_name:
+    port_ps_server_oam_port_0_subnetpoolid:
       type: string
       required: true
-    port_pd01_port_mac_requirements:
-      type: org.openecomp.datatypes.network.MacRequirements
-      required: true
-    vm_image_name:
+    vm_flavor_name:
       type: string
       required: true
-    port_pd01_port_ip_requirements:
+    port_ps_server_oam_port_0_ip_requirements:
       type: list
       required: true
       entry_schema:
         type: org.openecomp.datatypes.network.IpRequirements
-    port_pd01_port_network:
+    port_ps_server_oam_port_0_network:
       type: list
       required: true
       entry_schema:
         type: string
-    port_pd01_port_order:
-      type: integer
+    port_ps_server_oam_port_0_exCP_naming:
+      type: org.openecomp.datatypes.Naming
       required: true
-    port_pd01_port_subnetpoolid:
+    port_ps_server_oam_port_0_network_role:
       type: string
       required: true
-    port_pd01_port_network_role:
+    port_ps_server_oam_port_0_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.VlanRequirements
+    vm_image_name:
       type: string
       required: true
-    port_pd01_port_network_role_tag:
+    port_ps_server_oam_port_0_network_role_tag:
       type: string
       required: true
-    port_pd01_port_vlan_requirements:
+    port_ps_server_oam_port_0_related_networks:
       type: list
       required: true
       entry_schema:
-        type: org.openecomp.datatypes.network.VlanRequirements
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+    port_ps_server_oam_port_0_mac_requirements:
+      type: org.openecomp.datatypes.network.MacRequirements
+      required: true
+    port_ps_server_oam_port_0_order:
+      type: integer
+      required: true
   node_templates:
-    ps_server_pd01_port:
+    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_ps_server_oam_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_ps_server_oam_port_0_exCP_naming
         vlan_requirements:
-          get_input: port_pd01_port_vlan_requirements
+          get_input: port_ps_server_oam_port_0_vlan_requirements
         subinterface_indicator: false
         related_networks:
-          get_input: port_pd01_port_related_networks
+          get_input: port_ps_server_oam_port_0_related_networks
         ip_requirements:
-          get_input: port_pd01_port_ip_requirements
+          get_input: port_ps_server_oam_port_0_ip_requirements
         network_role_tag:
-          get_input: port_pd01_port_network_role_tag
+          get_input: port_ps_server_oam_port_0_network_role_tag
         mac_requirements:
-          get_input: port_pd01_port_mac_requirements
+          get_input: port_ps_server_oam_port_0_mac_requirements
         order:
-          get_input: port_pd01_port_order
+          get_input: port_ps_server_oam_port_0_order
         network_role:
-          get_input: port_pd01_port_network_role
+          get_input: port_ps_server_oam_port_0_network_role
         subnetpoolid:
-          get_input: port_pd01_port_subnetpoolid
+          get_input: port_ps_server_oam_port_0_subnetpoolid
         network:
           get_input:
-          - port_pd01_port_network
+          - port_ps_server_oam_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
   substitution_mappings:
     node_type: org.openecomp.resource.abstract.nodes.ps_server
     capabilities:
       instance_ps_server:
       - ps_server
       - instance
-      binding_ps_server_pd01_port:
-      - ps_server_pd01_port
-      - binding
+      network.incoming.packets.rate_ps_server_ps_server_oam_port_0:
+      - ps_server_ps_server_oam_port_0
+      - network.incoming.packets.rate
       host_ps_server:
       - ps_server
       - host
@@ -167,12 +167,15 @@ topology_template:
       disk.read.bytes_ps_server:
       - ps_server
       - disk.read.bytes
+      network.outgoing.packets.rate_ps_server_ps_server_oam_port_0:
+      - ps_server_ps_server_oam_port_0
+      - network.outgoing.packets.rate
+      network.incoming.packets_ps_server_ps_server_oam_port_0:
+      - ps_server_ps_server_oam_port_0
+      - network.incoming.packets
       disk.device.iops_ps_server:
       - ps_server
       - disk.device.iops
-      network.outpoing.packets_ps_server_pd01_port:
-      - ps_server_pd01_port
-      - network.outpoing.packets
       disk.device.latency_ps_server:
       - ps_server
       - disk.device.latency
@@ -188,39 +191,36 @@ topology_template:
       disk.write.requests.rate_ps_server:
       - ps_server
       - disk.write.requests.rate
-      network.outgoing.bytes_ps_server_pd01_port:
-      - ps_server_pd01_port
-      - network.outgoing.bytes
-      forwarder_ps_server_pd01_port:
-      - ps_server_pd01_port
-      - forwarder
       disk.write.requests_ps_server:
       - ps_server
       - disk.write.requests
-      network.incoming.bytes.rate_ps_server_pd01_port:
-      - ps_server_pd01_port
-      - network.incoming.bytes.rate
-      network.incoming.packets_ps_server_pd01_port:
-      - ps_server_pd01_port
-      - network.incoming.packets
+      network.outgoing.bytes_ps_server_ps_server_oam_port_0:
+      - ps_server_ps_server_oam_port_0
+      - network.outgoing.bytes
       disk.latency_ps_server:
       - ps_server
       - disk.latency
+      feature_ps_server_ps_server_oam_port_0:
+      - ps_server_ps_server_oam_port_0
+      - feature
       disk.ephemeral.size_ps_server:
       - ps_server
       - disk.ephemeral.size
       disk.device.capacity_ps_server:
       - ps_server
       - disk.device.capacity
+      forwarder_ps_server_ps_server_oam_port_0:
+      - ps_server_ps_server_oam_port_0
+      - forwarder
       disk.iops_ps_server:
       - ps_server
       - disk.iops
       disk.device.read.bytes.rate_ps_server:
       - ps_server
       - disk.device.read.bytes.rate
-      network.outgoing.packets.rate_ps_server_pd01_port:
-      - ps_server_pd01_port
-      - network.outgoing.packets.rate
+      network.incoming.bytes_ps_server_ps_server_oam_port_0:
+      - ps_server_ps_server_oam_port_0
+      - network.incoming.bytes
       cpu_util_ps_server:
       - ps_server
       - cpu_util
@@ -233,21 +233,18 @@ topology_template:
       disk.write.bytes_ps_server:
       - ps_server
       - disk.write.bytes
-      feature_ps_server_pd01_port:
-      - ps_server_pd01_port
-      - feature
-      network.outgoing.bytes.rate_ps_server_pd01_port:
-      - ps_server_pd01_port
-      - network.outgoing.bytes.rate
-      attachment_ps_server_pd01_port:
-      - ps_server_pd01_port
-      - attachment
+      network.outpoing.packets_ps_server_ps_server_oam_port_0:
+      - ps_server_ps_server_oam_port_0
+      - network.outpoing.packets
+      network.incoming.bytes.rate_ps_server_ps_server_oam_port_0:
+      - ps_server_ps_server_oam_port_0
+      - network.incoming.bytes.rate
+      binding_ps_server_ps_server_oam_port_0:
+      - ps_server_ps_server_oam_port_0
+      - binding
       disk.device.write.requests.rate_ps_server:
       - ps_server
       - disk.device.write.requests.rate
-      network.incoming.packets.rate_ps_server_pd01_port:
-      - ps_server_pd01_port
-      - network.incoming.packets.rate
       disk.read.requests_ps_server:
       - ps_server
       - disk.read.requests
@@ -260,6 +257,9 @@ topology_template:
       binding_ps_server:
       - ps_server
       - binding
+      attachment_ps_server_ps_server_oam_port_0:
+      - ps_server_ps_server_oam_port_0
+      - attachment
       os_ps_server:
       - ps_server
       - os
@@ -272,9 +272,6 @@ topology_template:
       vcpus_ps_server:
       - ps_server
       - vcpus
-      network.incoming.bytes_ps_server_pd01_port:
-      - ps_server_pd01_port
-      - network.incoming.bytes
       disk.usage_ps_server:
       - ps_server
       - disk.usage
@@ -290,16 +287,19 @@ topology_template:
       disk.device.allocation_ps_server:
       - ps_server
       - disk.device.allocation
+      network.outgoing.bytes.rate_ps_server_ps_server_oam_port_0:
+      - ps_server_ps_server_oam_port_0
+      - network.outgoing.bytes.rate
     requirements:
+      dependency_ps_server_ps_server_oam_port_0:
+      - ps_server_ps_server_oam_port_0
+      - dependency
       dependency_ps_server:
       - ps_server
       - dependency
-      dependency_ps_server_pd01_port:
-      - ps_server_pd01_port
-      - dependency
-      link_ps_server_pd01_port:
-      - ps_server_pd01_port
+      link_ps_server_ps_server_oam_port_0:
+      - ps_server_ps_server_oam_port_0
       - link
       local_storage_ps_server:
       - ps_server
-      - local_storage
\ No newline at end of file
+      - local_storage