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>

5 files changed, 539 insertions, 539 deletions

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 6892a548bf..7a2d9ce520 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -8,12 +8,20 @@ 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
       compute_pd_server_scheduler_hints:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: json
+      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
@@ -34,79 +42,71 @@ 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
-      port_pd01_port_related_networks:
+      vm_flavor_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      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_security_groups:
+      port_pd_server_oam_port_0_related_networks:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
-      port_pd01_port_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
-        required: true
-        status: SUPPORTED
+          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
         status: SUPPORTED
         entry_schema:
           type: string
+      port_pd_server_oam_port_0_security_groups:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
     attributes:
       pd_server_accessIPv4:
         type: string
         status: SUPPORTED
-      pd_server_pd01_port_device_owner:
+      pd_server_pd_server_oam_port_0_device_owner:
         type: string
         status: SUPPORTED
     requirements:
@@ -124,20 +124,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:
@@ -149,25 +154,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:
@@ -184,19 +189,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:
@@ -220,7 +233,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:
@@ -244,25 +257,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:
@@ -273,12 +291,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:
@@ -318,32 +343,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.
@@ -387,24 +392,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:
@@ -416,8 +416,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
@@ -439,21 +440,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
@@ -462,11 +476,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
@@ -476,16 +486,26 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
-      port_pd01_port_security_groups:
+      port_oam_server_oam_port_0_network_role:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_oam_server_oam_port_0_exCP_naming:
+        type: org.openecomp.datatypes.Naming
+        required: true
+        status: SUPPORTED
+      port_oam_server_oam_port_0_security_groups:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: json
-      port_pd01_port_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
+      port_oam_server_oam_port_0_network:
+        type: list
         required: true
         status: SUPPORTED
+        entry_schema:
+          type: string
       compute_oam_server_availability_zone:
         type: list
         required: true
@@ -496,26 +516,16 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
-      port_pd01_port_ip_requirements:
-        type: list
+      port_oam_server_oam_port_0_subnetpoolid:
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
-      port_pd01_port_network:
+      port_oam_server_oam_port_0_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
-      port_pd01_port_order:
-        type: integer
-        required: true
-        status: SUPPORTED
-      port_pd01_port_subnetpoolid:
-        type: string
-        required: true
-        status: SUPPORTED
+          type: org.openecomp.datatypes.network.IpRequirements
       compute_oam_server_user_data_format:
         type: list
         required: true
@@ -528,20 +538,10 @@ 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
       compute_oam_server_scheduler_hints:
         type: list
         required: true
@@ -553,14 +553,14 @@ node_types:
         type: string
         status: SUPPORTED
     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:
@@ -600,12 +600,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:
@@ -641,14 +635,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.
@@ -661,7 +647,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
@@ -678,21 +664,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
@@ -708,12 +693,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.
@@ -773,24 +770,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:
@@ -814,8 +806,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
@@ -835,19 +828,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:
@@ -876,15 +869,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
@@ -894,6 +886,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:
@@ -929,89 +929,76 @@ 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
+      port_ps_server_oam_port_0_subnetpoolid:
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vm_flavor_name:
         type: string
         required: true
         status: SUPPORTED
-      port_pd01_port_security_groups:
+      port_ps_server_oam_port_0_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
-      port_pd01_port_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
+          type: org.openecomp.datatypes.network.IpRequirements
+      port_ps_server_oam_port_0_network:
+        type: list
         required: true
         status: SUPPORTED
-      vm_image_name:
+        entry_schema:
+          type: string
+      port_ps_server_oam_port_0_exCP_naming:
+        type: org.openecomp.datatypes.Naming
+        required: true
+        status: SUPPORTED
+      port_ps_server_oam_port_0_network_role:
         type: string
         required: true
         status: SUPPORTED
-      port_pd01_port_ip_requirements:
+      port_ps_server_oam_port_0_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
-      port_pd01_port_network:
+          type: org.openecomp.datatypes.network.VlanRequirements
+      port_ps_server_oam_port_0_security_groups:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
-      port_pd01_port_order:
-        type: integer
+          type: json
+      vm_image_name:
+        type: string
         required: true
         status: SUPPORTED
-      port_pd01_port_subnetpoolid:
+      port_ps_server_oam_port_0_network_role_tag:
         type: string
         required: true
         status: SUPPORTED
-      port_pd01_port_network_role:
-        type: string
+      port_ps_server_oam_port_0_related_networks:
+        type: list
         required: true
         status: SUPPORTED
-      port_pd01_port_network_role_tag:
-        type: string
+        entry_schema:
+          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_pd01_port_vlan_requirements:
-        type: list
+      port_ps_server_oam_port_0_order:
+        type: integer
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
     attributes:
       ps_server_accessIPv4:
         type: string
         status: SUPPORTED
-      ps_server_pd01_port_device_id:
+      ps_server_ps_server_oam_port_0_device_id:
         type: string
         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
@@ -1026,6 +1013,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
@@ -1033,13 +1033,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
@@ -1101,13 +1099,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:
@@ -1142,38 +1146,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
@@ -1189,6 +1181,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.
@@ -1201,7 +1198,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:
@@ -1231,21 +1228,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
@@ -1253,12 +1254,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.
@@ -1282,6 +1277,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:
@@ -1305,12 +1305,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.
@@ -1339,4 +1333,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/threeDiffComputesWithAllConnectivities/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/MainServiceTemplate.yaml
index 8002f73309..c86f14b3d7 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/MainServiceTemplate.yaml
@@ -388,6 +388,9 @@ topology_template:
       properties:
         compute_pd_server_scheduler_hints:
         - group: BE_Affinity_group
+        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:
@@ -398,24 +401,21 @@ topology_template:
           get_attribute:
           - network_policy_server
           - name
-        port_pd01_port_security_groups:
-        - - jsa_security_group
-        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
+        port_pd_server_oam_port_0_security_groups:
+        - - jsa_security_group
         service_template_filter:
           substitute_service_template: Nested_pd_serverServiceTemplate.yaml
           count: 1
@@ -448,23 +448,23 @@ topology_template:
           get_attribute:
           - network_policy_server
           - name
-        port_pd01_port_security_groups:
-        - - jsa_security_group
-        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
+        port_ps_server_oam_port_0_security_groups:
+        - - jsa_security_group
+        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
@@ -483,34 +483,34 @@ 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_security_groups:
+        port_oam_server_oam_port_0_security_groups:
         - - jsa_security_group
-        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
         compute_oam_server_scheduler_hints:
         - group: BE_Affinity_group
         service_template_filter:
@@ -569,15 +569,15 @@ topology_template:
           direction: ingress
       requirements:
       - port:
-          capability: attachment_ps_server_pd01_port
+          capability: attachment_ps_server_ps_server_oam_port_0
           node: abstract_ps_server
           relationship: org.openecomp.relationships.AttachesTo
       - port:
-          capability: attachment_pd_server_pd01_port
+          capability: attachment_pd_server_pd_server_oam_port_0
           node: abstract_pd_server
           relationship: org.openecomp.relationships.AttachesTo
       - port:
-          capability: attachment_oam_server_pd01_port
+          capability: attachment_oam_server_oam_server_oam_port_0
           node: abstract_oam_server
           relationship: org.openecomp.relationships.AttachesTo
     network_policy_server_pd:
@@ -633,13 +633,13 @@ topology_template:
       value:
         get_attribute:
         - abstract_pd_server
-        - pd_server_pd01_port_device_owner
+        - pd_server_pd_server_oam_port_0_device_owner
     out5:
       description: output_regula
       value:
         get_attribute:
         - abstract_ps_server
-        - ps_server_pd01_port_device_id
+        - ps_server_ps_server_oam_port_0_device_id
     out1:
       description: output_regula
       value:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/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/threeDiffComputesWithAllConnectivities/out/Nested_oam_serverServiceTemplate.yaml
index 51e1b2117d..9a3b6f93e5 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/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/threeDiffComputesWithAllConnectivities/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,14 +37,22 @@ topology_template:
     vm_flavor_name:
       type: string
       required: true
-    port_pd01_port_security_groups:
+    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_security_groups:
       type: list
       required: true
       entry_schema:
         type: json
-    port_pd01_port_mac_requirements:
-      type: org.openecomp.datatypes.network.MacRequirements
+    port_oam_server_oam_port_0_network:
+      type: list
       required: true
+      entry_schema:
+        type: string
     compute_oam_server_availability_zone:
       type: list
       required: true
@@ -45,22 +61,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
@@ -71,52 +79,44 @@ 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
     compute_oam_server_scheduler_hints:
       type: list
       required: true
       entry_schema:
         type: json
   node_templates:
-    oam_server_pd01_port:
+    oam_server_oam_server_oam_port_0:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         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
         security_groups:
           get_input:
-          - port_pd01_port_security_groups
+          - port_oam_server_oam_port_0_security_groups
           - index_value
         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
         ip_requirements:
-          get_input: port_pd01_port_ip_requirements
+          get_input: port_oam_server_oam_port_0_ip_requirements
         related_networks:
-          get_input: port_pd01_port_related_networks
+          get_input: port_oam_server_oam_port_0_related_networks
         network_role_tag:
-          get_input: port_pd01_port_network_role_tag
+          get_input: port_oam_server_oam_port_0_network_role_tag
         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:
@@ -165,9 +165,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
@@ -186,17 +183,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
@@ -204,24 +198,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
@@ -252,18 +252,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
@@ -273,9 +270,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
@@ -285,15 +282,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
@@ -306,25 +303,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/threeDiffComputesWithAllConnectivities/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/threeDiffComputesWithAllConnectivities/out/Nested_pd_serverServiceTemplate.yaml
index f80b26c76a..7b21e1e88b 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/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/threeDiffComputesWithAllConnectivities/out/Nested_pd_serverServiceTemplate.yaml
@@ -11,11 +11,17 @@ 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
     compute_pd_server_scheduler_hints:
       type: list
       required: true
       entry_schema:
         type: json
+    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
@@ -33,60 +39,54 @@ 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
-    port_pd01_port_related_networks:
+    vm_flavor_name:
+      type: string
+      required: true
+    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_security_groups:
+    port_pd_server_oam_port_0_related_networks:
       type: list
       required: true
       entry_schema:
-        type: json
-    port_pd01_port_mac_requirements:
-      type: org.openecomp.datatypes.network.MacRequirements
-      required: true
+        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:
-      type: string
-      required: true
-    port_pd01_port_network_role:
+    port_pd_server_oam_port_0_network_role_tag:
       type: string
       required: true
-    port_pd01_port_network_role_tag:
-      type: string
-      required: true
-    port_pd01_port_vlan_requirements:
+    port_pd_server_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
       entry_schema:
         type: string
+    port_pd_server_oam_port_0_security_groups:
+      type: list
+      required: true
+      entry_schema:
+        type: json
   node_templates:
     pd_server:
       type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server
@@ -111,35 +111,35 @@ 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:
         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
         security_groups:
           get_input:
-          - port_pd01_port_security_groups
+          - port_pd_server_oam_port_0_security_groups
           - index_value
         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
         ip_requirements:
-          get_input: port_pd01_port_ip_requirements
+          get_input: port_pd_server_oam_port_0_ip_requirements
         related_networks:
-          get_input: port_pd01_port_related_networks
+          get_input: port_pd_server_oam_port_0_related_networks
         network_role_tag:
-          get_input: port_pd01_port_network_role_tag
+          get_input: port_pd_server_oam_port_0_network_role_tag
         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:
@@ -153,21 +153,27 @@ topology_template:
         get_attribute:
         - pd_server
         - accessIPv4
-    pd_server_pd01_port_device_owner:
+    pd_server_pd_server_oam_port_0_device_owner:
       type: string
       value:
         get_attribute:
-        - pd_server_pd01_port
+        - pd_server_pd_server_oam_port_0
         - device_owner
   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
@@ -177,24 +183,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
@@ -204,9 +210,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
@@ -216,27 +222,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
@@ -255,18 +267,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
@@ -288,24 +291,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
@@ -315,22 +315,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/threeDiffComputesWithAllConnectivities/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/threeDiffComputesWithAllConnectivities/out/Nested_ps_serverServiceTemplate.yaml
index 72a76e4df7..33bbcb22e2 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/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/threeDiffComputesWithAllConnectivities/out/Nested_ps_serverServiceTemplate.yaml
@@ -38,91 +38,56 @@ 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
+    port_ps_server_oam_port_0_subnetpoolid:
+      type: string
       required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     vm_flavor_name:
       type: string
       required: true
-    port_pd01_port_security_groups:
+    port_ps_server_oam_port_0_ip_requirements:
       type: list
       required: true
       entry_schema:
-        type: json
-    port_pd01_port_mac_requirements:
-      type: org.openecomp.datatypes.network.MacRequirements
+        type: org.openecomp.datatypes.network.IpRequirements
+    port_ps_server_oam_port_0_network:
+      type: list
       required: true
-    vm_image_name:
+      entry_schema:
+        type: string
+    port_ps_server_oam_port_0_exCP_naming:
+      type: org.openecomp.datatypes.Naming
+      required: true
+    port_ps_server_oam_port_0_network_role:
       type: string
       required: true
-    port_pd01_port_ip_requirements:
+    port_ps_server_oam_port_0_vlan_requirements:
       type: list
       required: true
       entry_schema:
-        type: org.openecomp.datatypes.network.IpRequirements
-    port_pd01_port_network:
+        type: org.openecomp.datatypes.network.VlanRequirements
+    port_ps_server_oam_port_0_security_groups:
       type: list
       required: true
       entry_schema:
-        type: string
-    port_pd01_port_order:
-      type: integer
-      required: true
-    port_pd01_port_subnetpoolid:
-      type: string
-      required: true
-    port_pd01_port_network_role:
+        type: json
+    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:
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        mac_requirements:
-          get_input: port_pd01_port_mac_requirements
-        order:
-          get_input: port_pd01_port_order
-        security_groups:
-          get_input:
-          - port_pd01_port_security_groups
-          - index_value
-        exCP_naming:
-          get_input: port_pd01_port_exCP_naming
-        vlan_requirements:
-          get_input: port_pd01_port_vlan_requirements
-        subinterface_indicator: false
-        ip_requirements:
-          get_input: port_pd01_port_ip_requirements
-        related_networks:
-          get_input: port_pd01_port_related_networks
-        network_role_tag:
-          get_input: port_pd01_port_network_role_tag
-        network_role:
-          get_input: port_pd01_port_network_role
-        subnetpoolid:
-          get_input: port_pd01_port_subnetpoolid
-        network:
-          get_input:
-          - port_pd01_port_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:
@@ -146,6 +111,41 @@ topology_template:
           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:
+        mac_requirements:
+          get_input: port_ps_server_oam_port_0_mac_requirements
+        order:
+          get_input: port_ps_server_oam_port_0_order
+        security_groups:
+          get_input:
+          - port_ps_server_oam_port_0_security_groups
+          - index_value
+        exCP_naming:
+          get_input: port_ps_server_oam_port_0_exCP_naming
+        vlan_requirements:
+          get_input: port_ps_server_oam_port_0_vlan_requirements
+        subinterface_indicator: false
+        ip_requirements:
+          get_input: port_ps_server_oam_port_0_ip_requirements
+        related_networks:
+          get_input: port_ps_server_oam_port_0_related_networks
+        network_role_tag:
+          get_input: port_ps_server_oam_port_0_network_role_tag
+        network_role:
+          get_input: port_ps_server_oam_port_0_network_role
+        subnetpoolid:
+          get_input: port_ps_server_oam_port_0_subnetpoolid
+        network:
+          get_input:
+          - port_ps_server_oam_port_0_network
+          - index_value
+      requirements:
+      - binding:
+          capability: tosca.capabilities.network.Bindable
+          node: ps_server
+          relationship: tosca.relationships.network.BindsTo
   outputs:
     ps_server_accessIPv4:
       type: string
@@ -153,11 +153,11 @@ topology_template:
         get_attribute:
         - ps_server
         - accessIPv4
-    ps_server_pd01_port_device_id:
+    ps_server_ps_server_oam_port_0_device_id:
       type: string
       value:
         get_attribute:
-        - ps_server_pd01_port
+        - ps_server_ps_server_oam_port_0
         - device_id
   substitution_mappings:
     node_type: org.openecomp.resource.abstract.nodes.ps_server
@@ -165,9 +165,9 @@ topology_template:
       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
@@ -198,12 +198,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
@@ -219,39 +222,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
@@ -264,21 +264,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
@@ -291,6 +288,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
@@ -303,9 +303,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
@@ -321,16 +318,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