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>

10 files changed, 2328 insertions, 2328 deletions

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml
index f444f3afe4..b6567195b3 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -946,44 +946,48 @@ node_types:
   org.openecomp.resource.abstract.nodes.pcma_server:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
-      port_pcm_port_3_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
-        required: true
-        status: SUPPORTED
-      port_pcm_port_2_network_role:
+      port_pcm_port_2_0_subnetpoolid:
         type: string
         required: true
         status: SUPPORTED
-      port_pcm_port_2_fixed_ips:
+      port_pcm_port_2_0_security_groups:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.heat.neutron.port.FixedIps
-      port_pcm_port_3_network_role:
-        type: string
+          type: json
+      port_pcm_port_2_0_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
         required: true
         status: SUPPORTED
-      port_pcm_port_3_vlan_requirements:
+      port_pcm_port_2_0_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
+      port_pcm_port_3_0_fixed_ips:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       vm_flavor_name:
         type: string
         required: true
         status: SUPPORTED
-      port_pcm_port_3_security_groups:
+      port_pcm_port_3_0_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
-      port_pcm_port_3_order:
-        type: integer
+          type: org.openecomp.datatypes.network.IpRequirements
+      port_pcm_port_3_0_related_networks:
+        type: list
         required: true
         status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       compute_pcma_server_availability_zone:
         type: list
         required: true
@@ -994,62 +998,48 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
-      port_pcm_port_2_security_groups:
+      port_pcm_port_3_0_security_groups:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: json
-      port_pcm_port_2_exCP_naming:
+      port_pcm_port_2_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
-      port_pcm_port_3_ip_requirements:
+      port_pcm_port_2_0_network:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
-      port_pcm_port_2_subnetpoolid:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_pcm_port_2_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
-        required: true
-        status: SUPPORTED
-      port_pcm_port_2_vlan_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
-      port_pcm_port_3_subnetpoolid:
+          type: string
+      port_pcm_port_2_0_network_role_tag:
         type: string
         required: true
         status: SUPPORTED
-      port_pcm_port_3_network_role_tag:
+      port_pcm_port_3_0_network_role_tag:
         type: string
         required: true
         status: SUPPORTED
-      compute_pcma_server_config_drive:
+      port_pcm_port_3_0_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: boolean
-      port_pcm_port_3_fixed_ips:
+          type: org.openecomp.datatypes.network.VlanRequirements
+      port_pcm_port_2_0_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.heat.neutron.port.FixedIps
-      port_pcm_port_3_related_networks:
+          type: org.openecomp.datatypes.network.IpRequirements
+      compute_pcma_server_config_drive:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+          type: boolean
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
@@ -1064,42 +1054,44 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      port_pcm_port_2_order:
-        type: integer
+      port_pcm_port_3_0_network:
+        type: list
         required: true
         status: SUPPORTED
-      port_pcm_port_3_exCP_naming:
-        type: org.openecomp.datatypes.Naming
+        entry_schema:
+          type: string
+      port_pcm_port_2_0_network_role:
+        type: string
         required: true
         status: SUPPORTED
-      port_pcm_port_2_network:
+      port_pcm_port_2_0_related_networks:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
-      port_pcm_port_2_ip_requirements:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+      port_pcm_port_2_0_fixed_ips:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
-      port_pcm_port_2_network_role_tag:
-        type: string
+          type: org.openecomp.datatypes.heat.neutron.port.FixedIps
+      port_pcm_port_2_0_order:
+        type: integer
         required: true
         status: SUPPORTED
-      port_pcm_port_2_related_networks:
-        type: list
+      port_pcm_port_3_0_exCP_naming:
+        type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
-      port_pcm_port_3_network:
-        type: list
+      port_pcm_port_3_0_subnetpoolid:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_pcm_port_3_0_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       compute_pcma_server_scheduler_hints:
         type: list
         required: true
@@ -1112,6 +1104,14 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_pcm_port_3_0_network_role:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_pcm_port_3_0_order:
+        type: integer
+        required: true
+        status: SUPPORTED
     requirements:
     - dependency_pcma_server:
         capability: tosca.capabilities.Node
@@ -1127,27 +1127,27 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_pcma_server_pcm_port_3:
+    - dependency_pcma_server_pcm_port_2_0:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_pcma_server_pcm_port_3:
+    - link_pcma_server_pcm_port_2_0:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
         - 1
         - 1
-    - dependency_pcma_server_pcm_port_2:
+    - dependency_pcma_server_pcm_port_3_0:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_pcma_server_pcm_port_2:
+    - link_pcma_server_pcm_port_3_0:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
@@ -1160,6 +1160,30 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      network.incoming.packets_pcma_server_pcm_port_3_0:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.outgoing.packets.rate_pcma_server_pcm_port_2_0:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.incoming.bytes.rate_pcma_server_pcm_port_2_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_pcma_server_pcm_port_2_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
       scalable_pcma_server:
         type: tosca.capabilities.Scalable
         occurrences:
@@ -1184,13 +1208,13 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.usage_pcma_server:
+      network.outpoing.packets_pcma_server_pcm_port_2_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_pcma_server_pcm_port_3:
+      disk.usage_pcma_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:
@@ -1208,17 +1232,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_pcma_server_pcm_port_2:
-        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_pcma_server_pcm_port_2:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
       endpoint_pcma_server:
         type: tosca.capabilities.Endpoint.Admin
         occurrences:
@@ -1229,16 +1242,13 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_pcma_server_pcm_port_3:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
-      network.incoming.bytes.rate_pcma_server_pcm_port_2:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      binding_pcma_server_pcm_port_2_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
       memory.usage_pcma_server:
         type: org.openecomp.capabilities.metric.Ceilometer
@@ -1246,23 +1256,14 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_pcma_server_pcm_port_3:
+      network.outgoing.bytes_pcma_server_pcm_port_2_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
-      binding_pcma_server_pcm_port_3:
-        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
-      network.incoming.bytes.rate_pcma_server_pcm_port_3:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_pcma_server_pcm_port_3_0:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
@@ -1272,9 +1273,8 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_pcma_server_pcm_port_2:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      forwarder_pcma_server_pcm_port_3_0:
+        type: org.openecomp.capabilities.Forwarder
         occurrences:
         - 1
         - UNBOUNDED
@@ -1290,132 +1290,115 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes.rate_pcma_server:
+      network.incoming.packets.rate_pcma_server_pcm_port_3_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_pcma_server_pcm_port_3:
+      disk.read.bytes.rate_pcma_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
-      binding_pcma_server_pcm_port_2:
-        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
       os_pcma_server:
         type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_pcma_server_pcm_port_2:
+      network.incoming.bytes_pcma_server_pcm_port_3_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_pcma_server_pcm_port_3:
+      disk.device.read.requests_pcma_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_pcma_server_pcm_port_3:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      attachment_pcma_server_pcm_port_3_0:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_pcma_server_pcm_port_2:
+      disk.write.bytes.rate_pcma_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_pcma_server_pcm_port_2:
-        type: org.openecomp.capabilities.Forwarder
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.device.read.requests_pcma_server:
+      disk.device.write.requests.rate_pcma_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_pcma_server_pcm_port_3:
-        type: org.openecomp.capabilities.Forwarder
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.write.bytes.rate_pcma_server:
+      cpu_util_pcma_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_pcma_server_pcm_port_2:
+      disk.device.write.bytes_pcma_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.rate_pcma_server:
+      disk.device.read.bytes.rate_pcma_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_pcma_server:
+      disk.device.usage_pcma_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_pcma_server:
+      disk.read.requests_pcma_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.bytes.rate_pcma_server:
+      disk.allocation_pcma_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_pcma_server:
+      network.outgoing.packets.rate_pcma_server_pcm_port_3_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.read.requests_pcma_server:
+      network.incoming.bytes.rate_pcma_server_pcm_port_3_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.allocation_pcma_server:
+      network.incoming.packets_pcma_server_pcm_port_2_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_pcma_server_pcm_port_2:
-        type: tosca.capabilities.Node
+      network.outgoing.bytes.rate_pcma_server_pcm_port_3_0:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_pcma_server_pcm_port_3:
-        type: tosca.capabilities.Node
+      network.outpoing.packets_pcma_server_pcm_port_3_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
@@ -1466,25 +1449,43 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pcma_server_pcm_port_2_0:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      binding_pcma_server_pcm_port_3_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
       disk.write.bytes_pcma_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_pcma_server:
+      network.outgoing.bytes_pcma_server_pcm_port_3_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_pcma_server_pcm_port_2:
+      disk.write.requests_pcma_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_pcma_server_pcm_port_3:
+      feature_pcma_server_pcm_port_2_0:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.incoming.packets.rate_pcma_server_pcm_port_2_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:
@@ -1496,31 +1497,30 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.iops_pcma_server:
+      network.incoming.bytes_pcma_server_pcm_port_2_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_pcma_server:
+      disk.device.iops_pcma_server:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_pcma_server_pcm_port_3:
+      instance_pcma_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.latency_pcma_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_pcma_server_pcm_port_2_0:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_pcma_server_pcm_port_2:
+      disk.device.latency_pcma_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:
@@ -2128,86 +2128,78 @@ node_types:
   org.openecomp.resource.abstract.nodes.1c2_catalog_instance:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
-      port_1c2_t2_port_order:
-        type: integer
-        required: true
-        status: SUPPORTED
-      compute_1c2_catalog_instance_availability_zone:
+      port_1c2_catalog_instance_t1_port_0_network:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_1c2_t2_port_subnetpoolid:
-        type: string
+      port_1c2_catalog_instance_t2_port_0_vlan_requirements:
+        type: list
         required: true
         status: SUPPORTED
-      port_1c2_t1_port_related_networks:
+        entry_schema:
+          type: org.openecomp.datatypes.network.VlanRequirements
+      compute_1c2_catalog_instance_availability_zone:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
-      port_1c2_t2_port_network_role:
-        type: string
+          type: string
+      port_1c2_catalog_instance_t1_port_0_ip_requirements:
+        type: list
         required: true
         status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.IpRequirements
       vm_flavor_name:
         type: string
         required: true
         status: SUPPORTED
-      port_1c2_t2_port_network_role_tag:
+      port_1c2_catalog_instance_t2_port_0_network_role_tag:
         type: string
         required: true
         status: SUPPORTED
-      port_1c2_t1_port_vlan_requirements:
+      port_1c2_catalog_instance_t2_port_0_network:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
+          type: string
       vm_image_name:
         type: string
         required: true
         status: SUPPORTED
-      port_1c2_t2_port_exCP_naming:
-        type: org.openecomp.datatypes.Naming
+      port_1c2_catalog_instance_t1_port_0_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
         required: true
         status: SUPPORTED
-      port_1c2_t1_port_order:
-        type: integer
+      port_1c2_catalog_instance_t2_port_0_network_role:
+        type: string
         required: true
         status: SUPPORTED
-      port_1c2_t1_port_subnetpoolid:
+      port_1c2_catalog_instance_t1_port_0_subnetpoolid:
         type: string
         required: true
         status: SUPPORTED
-      port_1c2_t2_port_ip_requirements:
-        type: list
+      port_1c2_catalog_instance_t2_port_0_order:
+        type: integer
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
-      port_1c2_t2_port_related_networks:
+      port_1c2_catalog_instance_t2_port_0_related_networks:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
-      port_1c2_t1_port_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
-        required: true
-        status: SUPPORTED
-      port_1c2_t1_port_network_role:
-        type: string
+      port_1c2_catalog_instance_t1_port_0_order:
+        type: integer
         required: true
         status: SUPPORTED
-      port_1c2_t2_port_network:
-        type: list
+      port_1c2_catalog_instance_t2_port_0_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
@@ -2222,42 +2214,50 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      port_1c2_t1_port_exCP_naming:
-        type: org.openecomp.datatypes.Naming
+      port_1c2_catalog_instance_t2_port_0_ip_requirements:
+        type: list
         required: true
         status: SUPPORTED
-      port_1c2_t1_port_network:
+        entry_schema:
+          type: org.openecomp.datatypes.network.IpRequirements
+      port_1c2_catalog_instance_t1_port_0_related_networks:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
-      port_1c2_t2_port_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+      port_1c2_catalog_instance_t2_port_0_subnetpoolid:
+        type: string
         required: true
         status: SUPPORTED
-      port_1c2_t2_port_vlan_requirements:
-        type: list
+      port_1c2_catalog_instance_t1_port_0_network_role:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_1c2_catalog_instance_t1_port_0_exCP_naming:
+        type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
       compute_1c2_catalog_instance_user_data_format:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_1c2_t1_port_network_role_tag:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_1c2_t1_port_ip_requirements:
+      port_1c2_catalog_instance_t1_port_0_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
+          type: org.openecomp.datatypes.network.VlanRequirements
+      port_1c2_catalog_instance_t2_port_0_exCP_naming:
+        type: org.openecomp.datatypes.Naming
+        required: true
+        status: SUPPORTED
+      port_1c2_catalog_instance_t1_port_0_network_role_tag:
+        type: string
+        required: true
+        status: SUPPORTED
       compute_1c2_catalog_instance_scheduler_hints:
         type: list
         required: true
@@ -2268,7 +2268,7 @@ node_types:
       1c2_catalog_instance_instance_name:
         type: string
         status: SUPPORTED
-      1c2_catalog_instance_1c2_t1_port_tenant_id:
+      1c2_catalog_instance_1c2_catalog_instance_t1_port_0_tenant_id:
         type: string
         status: SUPPORTED
     requirements:
@@ -2286,27 +2286,27 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_1c2_catalog_instance_1c2_t2_port:
+    - dependency_1c2_catalog_instance_1c2_catalog_instance_t1_port_0:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_1c2_catalog_instance_1c2_t2_port:
+    - link_1c2_catalog_instance_1c2_catalog_instance_t1_port_0:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
         - 1
         - 1
-    - dependency_1c2_catalog_instance_1c2_t1_port:
+    - dependency_1c2_catalog_instance_1c2_catalog_instance_t2_port_0:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_1c2_catalog_instance_1c2_t1_port:
+    - link_1c2_catalog_instance_1c2_catalog_instance_t2_port_0:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
@@ -2319,12 +2319,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_1c2_catalog_instance_1c2_t2_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.bytes.rate_1c2_catalog_instance:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -2337,9 +2331,8 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_1c2_catalog_instance_1c2_t1_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_1c2_catalog_instance_1c2_catalog_instance_t1_port_0:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
@@ -2349,73 +2342,78 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_1c2_catalog_instance_1c2_t2_port:
+      cpu_util_1c2_catalog_instance:
         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
-      binding_1c2_catalog_instance_1c2_t2_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.bytes.rate_1c2_catalog_instance_1c2_catalog_instance_t2_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
-      network.incoming.packets_1c2_catalog_instance_1c2_t1_port:
+      cpu_1c2_catalog_instance:
         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_1c2_catalog_instance:
+      disk.read.requests_1c2_catalog_instance:
         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_1c2_catalog_instance_1c2_t2_port:
+      network.outpoing.packets_1c2_catalog_instance_1c2_catalog_instance_t2_port_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_1c2_catalog_instance_1c2_t1_port:
-        type: tosca.capabilities.Node
+      disk.ephemeral.size_1c2_catalog_instance:
+        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_1c2_catalog_instance_1c2_t1_port:
-        type: tosca.capabilities.Attachment
+      disk.device.write.bytes_1c2_catalog_instance:
+        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_1c2_catalog_instance_1c2_t2_port:
+      memory.resident_1c2_catalog_instance:
         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_1c2_catalog_instance:
+      network.outpoing.packets_1c2_catalog_instance_1c2_catalog_instance_t1_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.read.requests_1c2_catalog_instance:
+      disk.device.write.requests.rate_1c2_catalog_instance:
         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_1c2_catalog_instance_1c2_t1_port:
+      os_1c2_catalog_instance:
+        type: tosca.capabilities.OperatingSystem
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.iops_1c2_catalog_instance:
         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
-      binding_1c2_catalog_instance_1c2_t1_port:
+      binding_1c2_catalog_instance_1c2_catalog_instance_t1_port_0:
         type: tosca.capabilities.network.Bindable
         valid_source_types:
         - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
@@ -2423,42 +2421,30 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-      disk.ephemeral.size_1c2_catalog_instance:
-        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_1c2_catalog_instance:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_1c2_catalog_instance_1c2_catalog_instance_t1_port_0:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      memory.resident_1c2_catalog_instance:
+      network.outgoing.bytes_1c2_catalog_instance_1c2_catalog_instance_t1_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_1c2_catalog_instance:
+      network.outgoing.bytes.rate_1c2_catalog_instance_1c2_catalog_instance_t1_port_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_1c2_catalog_instance_1c2_t1_port:
+      network.outgoing.packets.rate_1c2_catalog_instance_1c2_catalog_instance_t1_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
-      os_1c2_catalog_instance:
-        type: tosca.capabilities.OperatingSystem
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.device.iops_1c2_catalog_instance:
+      network.incoming.packets_1c2_catalog_instance_1c2_catalog_instance_t1_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:
@@ -2475,19 +2461,19 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.latency_1c2_catalog_instance:
+      network.incoming.bytes.rate_1c2_catalog_instance_1c2_catalog_instance_t1_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_1c2_catalog_instance_1c2_t1_port:
+      disk.latency_1c2_catalog_instance:
         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_1c2_catalog_instance_1c2_t1_port:
+      network.incoming.bytes_1c2_catalog_instance_1c2_catalog_instance_t1_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:
@@ -2499,15 +2485,13 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_1c2_catalog_instance_1c2_t2_port:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      forwarder_1c2_catalog_instance_1c2_catalog_instance_t1_port_0:
+        type: org.openecomp.capabilities.Forwarder
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_1c2_catalog_instance_1c2_t2_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_1c2_catalog_instance_1c2_catalog_instance_t2_port_0:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
@@ -2523,29 +2507,19 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_1c2_catalog_instance_1c2_t2_port:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
-      forwarder_1c2_catalog_instance_1c2_t1_port:
-        type: org.openecomp.capabilities.Forwarder
-        occurrences:
-        - 1
-        - UNBOUNDED
-      network.outgoing.packets.rate_1c2_catalog_instance_1c2_t1_port:
+      disk.read.bytes_1c2_catalog_instance:
         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.bytes_1c2_catalog_instance:
+      instance_1c2_catalog_instance:
         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_1c2_catalog_instance:
+      network.incoming.packets.rate_1c2_catalog_instance_1c2_catalog_instance_t2_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:
@@ -2569,11 +2543,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      forwarder_1c2_catalog_instance_1c2_t2_port:
-        type: org.openecomp.capabilities.Forwarder
-        occurrences:
-        - 1
-        - UNBOUNDED
       disk.device.allocation_1c2_catalog_instance:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -2586,12 +2555,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_1c2_catalog_instance_1c2_t2_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_1c2_catalog_instance:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -2634,29 +2597,54 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_1c2_catalog_instance_1c2_t2_port:
+      binding_1c2_catalog_instance_1c2_catalog_instance_t2_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
+      network.incoming.packets_1c2_catalog_instance_1c2_catalog_instance_t2_port_0:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      feature_1c2_catalog_instance_1c2_catalog_instance_t2_port_0:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.outgoing.bytes_1c2_catalog_instance_1c2_catalog_instance_t2_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.usage_1c2_catalog_instance:
+      network.outgoing.bytes.rate_1c2_catalog_instance_1c2_catalog_instance_t2_port_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_1c2_catalog_instance:
-        type: tosca.capabilities.Node
+      disk.usage_1c2_catalog_instance:
+        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_1c2_catalog_instance_1c2_t1_port:
+      network.outgoing.packets.rate_1c2_catalog_instance_1c2_catalog_instance_t2_port_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
+      feature_1c2_catalog_instance:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
       memory_1c2_catalog_instance:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -2686,8 +2674,20 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      feature_1c2_catalog_instance_1c2_t2_port:
-        type: tosca.capabilities.Node
+      forwarder_1c2_catalog_instance_1c2_catalog_instance_t2_port_0:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.incoming.packets.rate_1c2_catalog_instance_1c2_catalog_instance_t1_port_0:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.incoming.bytes_1c2_catalog_instance_1c2_catalog_instance_t2_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
@@ -2700,104 +2700,84 @@ node_types:
   org.openecomp.resource.abstract.nodes.pcma_server_1:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
-      port_pcm_port_1_related_networks:
-        type: list
+      port_pcm_port_0_0_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
-      port_pcm_port_0_network_role:
-        type: string
+      port_pcm_port_1_0_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
         required: true
         status: SUPPORTED
-      port_pcm_port_1_network_role_tag:
+      port_pcm_port_1_0_order:
+        type: integer
+        required: true
+        status: SUPPORTED
+      vm_flavor_name:
         type: string
         required: true
         status: SUPPORTED
-      port_pcm_port_0_fixed_ips:
-        type: list
+      port_pcm_port_0_0_order:
+        type: integer
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.heat.neutron.port.FixedIps
-      port_pcm_port_0_vlan_requirements:
+      compute_pcma_server_availability_zone:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
-      vm_flavor_name:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_pcm_port_0_security_groups:
+          type: string
+      port_pcm_port_0_0_security_groups:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: json
-      compute_pcma_server_availability_zone:
+      port_pcm_port_1_0_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
-      port_pcm_port_0_order:
-        type: integer
-        required: true
-        status: SUPPORTED
-      port_pcm_port_0_subnetpoolid:
-        type: string
+          type: org.openecomp.datatypes.network.VlanRequirements
+      port_pcm_port_0_0_network:
+        type: list
         required: true
         status: SUPPORTED
+        entry_schema:
+          type: string
       vm_image_name:
         type: string
         required: true
         status: SUPPORTED
-      port_pcm_port_0_related_networks:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
-      port_pcm_port_1_subnetpoolid:
+      port_pcm_port_1_0_subnetpoolid:
         type: string
         required: true
         status: SUPPORTED
-      port_pcm_port_0_network_role_tag:
+      port_pcm_port_0_0_network_role_tag:
         type: string
         required: true
         status: SUPPORTED
-      port_pcm_port_1_exCP_naming:
-        type: org.openecomp.datatypes.Naming
+      port_pcm_port_1_0_ip_requirements:
+        type: list
         required: true
         status: SUPPORTED
-      port_pcm_port_0_exCP_naming:
+        entry_schema:
+          type: org.openecomp.datatypes.network.IpRequirements
+      port_pcm_port_0_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
-      port_pcm_port_1_network_role:
+      port_pcm_port_1_0_network_role_tag:
         type: string
         required: true
         status: SUPPORTED
-      port_pcm_port_1_network:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: string
-      port_pcm_port_1_security_groups:
-        type: list
+      port_pcm_port_1_0_network_role:
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: json
-      port_pcm_port_0_ip_requirements:
-        type: list
+      port_pcm_port_1_0_exCP_naming:
+        type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
       compute_pcma_server_config_drive:
         type: list
         required: true
@@ -2818,48 +2798,68 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      port_pcm_port_0_network:
+      port_pcm_port_0_0_related_networks:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
-      port_pcm_port_1_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+      port_pcm_port_0_0_subnetpoolid:
+        type: string
         required: true
         status: SUPPORTED
-      port_pcm_port_1_vlan_requirements:
+      port_pcm_port_0_0_network_role:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_pcm_port_1_0_related_networks:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
-      port_pcm_port_1_fixed_ips:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+      port_pcm_port_0_0_ip_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.IpRequirements
+      port_pcm_port_1_0_security_groups:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_pcm_port_0_0_fixed_ips:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
-      compute_pcma_server_name:
+      port_pcm_port_1_0_fixed_ips:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
-      port_pcm_port_1_ip_requirements:
+          type: org.openecomp.datatypes.heat.neutron.port.FixedIps
+      port_pcm_port_0_0_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
-      port_pcm_port_0_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
+          type: org.openecomp.datatypes.network.VlanRequirements
+      compute_pcma_server_name:
+        type: list
         required: true
         status: SUPPORTED
-      port_pcm_port_1_order:
-        type: integer
+        entry_schema:
+          type: string
+      port_pcm_port_1_0_network:
+        type: list
         required: true
         status: SUPPORTED
+        entry_schema:
+          type: string
     requirements:
     - dependency_pcma_server:
         capability: tosca.capabilities.Node
@@ -2875,27 +2875,27 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_pcma_server_pcm_port_0:
+    - dependency_pcma_server_pcm_port_0_0:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_pcma_server_pcm_port_0:
+    - link_pcma_server_pcm_port_0_0:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
         - 1
         - 1
-    - dependency_pcma_server_pcm_port_1:
+    - dependency_pcma_server_pcm_port_1_0:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_pcma_server_pcm_port_1:
+    - link_pcma_server_pcm_port_1_0:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
@@ -2908,6 +2908,18 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      network.incoming.bytes.rate_pcma_server_pcm_port_0_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_pcma_server_pcm_port_1_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
       scalable_pcma_server:
         type: tosca.capabilities.Scalable
         occurrences:
@@ -2919,6 +2931,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      network.outgoing.bytes.rate_pcma_server_pcm_port_0_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
       host_pcma_server:
         type: tosca.capabilities.Container
         valid_source_types:
@@ -2932,46 +2950,36 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.usage_pcma_server:
+      network.outgoing.packets.rate_pcma_server_pcm_port_0_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_pcma_server_pcm_port_0:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.read.bytes_pcma_server:
+      network.outpoing.packets_pcma_server_pcm_port_0_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.iops_pcma_server:
+      disk.usage_pcma_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.bytes.rate_pcma_server_pcm_port_0:
+      disk.read.bytes_pcma_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.bytes.rate_pcma_server_pcm_port_1:
+      disk.iops_pcma_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_pcma_server_pcm_port_1:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
       endpoint_pcma_server:
         type: tosca.capabilities.Endpoint.Admin
         occurrences:
@@ -2988,19 +2996,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_pcma_server_pcm_port_0:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
-      network.incoming.bytes.rate_pcma_server_pcm_port_1:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      forwarder_pcma_server_pcm_port_1_0:
+        type: org.openecomp.capabilities.Forwarder
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_pcma_server_pcm_port_0:
+      network.outgoing.bytes_pcma_server_pcm_port_0_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:
@@ -3012,7 +3013,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_pcma_server_pcm_port_1:
+      network.incoming.packets.rate_pcma_server_pcm_port_1_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:
@@ -3036,13 +3037,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_pcma_server_pcm_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.
+      feature_pcma_server_pcm_port_1_0:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      binding_pcma_server_pcm_port_0:
+      binding_pcma_server_pcm_port_0_0:
         type: tosca.capabilities.network.Bindable
         valid_source_types:
         - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
@@ -3050,41 +3050,17 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-      network.incoming.packets_pcma_server_pcm_port_1:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
       os_pcma_server:
         type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      binding_pcma_server_pcm_port_1:
-        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
-      network.incoming.packets.rate_pcma_server_pcm_port_1:
+      network.incoming.bytes_pcma_server_pcm_port_1_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
-      forwarder_pcma_server_pcm_port_0:
-        type: org.openecomp.capabilities.Forwarder
-        occurrences:
-        - 1
-        - UNBOUNDED
-      forwarder_pcma_server_pcm_port_1:
-        type: org.openecomp.capabilities.Forwarder
-        occurrences:
-        - 1
-        - UNBOUNDED
       disk.device.read.requests_pcma_server:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -3097,9 +3073,8 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_pcma_server_pcm_port_1:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      attachment_pcma_server_pcm_port_1_0:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
@@ -3109,61 +3084,63 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_pcma_server_pcm_port_0:
+      cpu_util_pcma_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_pcma_server_pcm_port_0:
+      disk.device.write.bytes_pcma_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_pcma_server:
+      disk.device.read.bytes.rate_pcma_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_pcma_server:
+      disk.device.usage_pcma_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.bytes.rate_pcma_server:
+      disk.read.requests_pcma_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_pcma_server:
+      disk.allocation_pcma_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_pcma_server:
+      network.incoming.packets_pcma_server_pcm_port_0_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.allocation_pcma_server:
+      network.incoming.bytes.rate_pcma_server_pcm_port_1_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_pcma_server_pcm_port_0:
-        type: tosca.capabilities.Node
+      network.outgoing.bytes.rate_pcma_server_pcm_port_1_0:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_pcma_server_pcm_port_1:
-        type: tosca.capabilities.Node
+      network.outgoing.packets.rate_pcma_server_pcm_port_1_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
@@ -3173,6 +3150,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      network.outpoing.packets_pcma_server_pcm_port_1_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
       binding_pcma_server:
         type: tosca.capabilities.network.Bindable
         occurrences:
@@ -3220,24 +3203,42 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_pcma_server_pcm_port_0:
+      forwarder_pcma_server_pcm_port_0_0:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.outgoing.bytes_pcma_server_pcm_port_1_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.write.requests_pcma_server:
+      network.incoming.packets.rate_pcma_server_pcm_port_0_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_pcma_server_pcm_port_1:
+      feature_pcma_server_pcm_port_0_0:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.write.requests_pcma_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
+      binding_pcma_server_pcm_port_1_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
       disk.write.requests.rate_pcma_server:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -3250,82 +3251,93 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      instance_pcma_server:
+      network.incoming.bytes_pcma_server_pcm_port_0_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.latency_pcma_server:
+      instance_pcma_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_pcma_server:
+      disk.device.latency_pcma_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.capacity_pcma_server:
+      disk.capacity_pcma_server:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_pcma_server_pcm_port_1:
+      disk.device.capacity_pcma_server:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_pcma_server_pcm_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.
+      attachment_pcma_server_pcm_port_0_0:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
   org.openecomp.resource.abstract.nodes.b_single_1b:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
-      port_1b_t1_port_order:
-        type: integer
+      port_b_single_1b_t1_port_0_network_role_tag:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_b_single_1b_t1_port_0_related_networks:
+        type: list
         required: true
         status: SUPPORTED
-      port_1b_t1_port_network_role:
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+      port_b_single_1b_t2_port_0_subnetpoolid:
         type: string
         required: true
         status: SUPPORTED
-      port_1b_t1_port_exCP_naming:
-        type: org.openecomp.datatypes.Naming
+      port_b_single_1b_t1_port_0_network_role:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_b_single_1b_t2_port_0_network:
+        type: list
         required: true
         status: SUPPORTED
+        entry_schema:
+          type: string
       vm_flavor_name:
         type: string
         required: true
         status: SUPPORTED
-      port_1b_t2_port_related_networks:
+      port_b_single_1b_t1_port_0_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
-      port_1b_t1_port_ip_requirements:
+          type: org.openecomp.datatypes.network.VlanRequirements
+      port_b_single_1b_t2_port_0_related_networks:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vm_image_name:
         type: string
         required: true
         status: SUPPORTED
-      port_1b_t2_port_network_role:
-        type: string
+      port_b_single_1b_t2_port_0_order:
+        type: integer
         required: true
         status: SUPPORTED
-      port_1b_t2_port_order:
+      port_b_single_1b_t1_port_0_order:
         type: integer
         required: true
         status: SUPPORTED
@@ -3335,34 +3347,32 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      port_1b_t2_port_exCP_naming:
-        type: org.openecomp.datatypes.Naming
-        required: true
-        status: SUPPORTED
-      port_1b_t2_port_network_role_tag:
-        type: string
+      port_b_single_1b_t2_port_0_vlan_requirements:
+        type: list
         required: true
         status: SUPPORTED
-      port_1b_t2_port_subnetpoolid:
+        entry_schema:
+          type: org.openecomp.datatypes.network.VlanRequirements
+      port_b_single_1b_t2_port_0_network_role:
         type: string
         required: true
         status: SUPPORTED
-      port_1b_t1_port_related_networks:
+      port_b_single_1b_t1_port_0_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
-      port_1b_t2_port_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
-        required: true
-        status: SUPPORTED
+          type: org.openecomp.datatypes.network.IpRequirements
       compute_b_single_1b_availability_zone:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
+      port_b_single_1b_t1_port_0_exCP_naming:
+        type: org.openecomp.datatypes.Naming
+        required: true
+        status: SUPPORTED
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
@@ -3377,42 +3387,32 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: json
-      port_1b_t2_port_vlan_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
-      port_1b_t2_port_ip_requirements:
-        type: list
+      port_b_single_1b_t1_port_0_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
-      port_1b_t1_port_network_role_tag:
+      port_b_single_1b_t1_port_0_subnetpoolid:
         type: string
         required: true
         status: SUPPORTED
-      port_1b_t1_port_subnetpoolid:
+      port_b_single_1b_t2_port_0_network_role_tag:
         type: string
         required: true
         status: SUPPORTED
-      port_1b_t1_port_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
-        required: true
-        status: SUPPORTED
-      port_1b_t2_port_network:
+      port_b_single_1b_t2_port_0_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
-      port_1b_t1_port_vlan_requirements:
-        type: list
+          type: org.openecomp.datatypes.network.IpRequirements
+      port_b_single_1b_t2_port_0_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
+        required: true
+        status: SUPPORTED
+      port_b_single_1b_t2_port_0_exCP_naming:
+        type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
       compute_b_single_1b_name:
         type: list
         required: true
@@ -3423,7 +3423,7 @@ node_types:
       b_single_1b_instance_name:
         type: string
         status: SUPPORTED
-      b_single_1b_1b_t1_port_tenant_id:
+      b_single_1b_b_single_1b_t1_port_0_tenant_id:
         type: string
         status: SUPPORTED
     requirements:
@@ -3441,43 +3441,33 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_b_single_1b_1b_t1_port:
+    - dependency_b_single_1b_b_single_1b_t2_port_0:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_b_single_1b_1b_t1_port:
+    - link_b_single_1b_b_single_1b_t2_port_0:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
         - 1
         - 1
-    - dependency_b_single_1b_1b_t2_port:
+    - dependency_b_single_1b_b_single_1b_t1_port_0:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_b_single_1b_1b_t2_port:
+    - link_b_single_1b_b_single_1b_t1_port_0:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
         - 1
         - 1
     capabilities:
-      attachment_b_single_1b_1b_t2_port:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
-      forwarder_b_single_1b_1b_t2_port:
-        type: org.openecomp.capabilities.Forwarder
-        occurrences:
-        - 1
-        - UNBOUNDED
       endpoint_b_single_1b:
         type: tosca.capabilities.Endpoint.Admin
         occurrences:
@@ -3494,23 +3484,56 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_b_single_1b_1b_t2_port:
+      network.incoming.bytes_b_single_1b_b_single_1b_t1_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_b_single_1b_1b_t2_port:
+      network.incoming.packets.rate_b_single_1b_b_single_1b_t2_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
-      forwarder_b_single_1b_1b_t1_port:
-        type: org.openecomp.capabilities.Forwarder
+      network.incoming.bytes_b_single_1b_b_single_1b_t2_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
+      binding_b_single_1b_b_single_1b_t1_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
+      feature_b_single_1b_b_single_1b_t2_port_0:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      feature_b_single_1b_b_single_1b_t1_port_0:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
+      network.incoming.bytes.rate_b_single_1b_b_single_1b_t1_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
+      binding_b_single_1b_b_single_1b_t2_port_0:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
       scalable_b_single_1b:
         type: tosca.capabilities.Scalable
         occurrences:
@@ -3527,6 +3550,16 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_b_single_1b_b_single_1b_t2_port_0:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      forwarder_b_single_1b_b_single_1b_t1_port_0:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       vcpus_b_single_1b:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -3539,25 +3572,25 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests.rate_b_single_1b:
+      network.incoming.bytes.rate_b_single_1b_b_single_1b_t2_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_b_single_1b_1b_t2_port:
+      disk.device.read.requests.rate_b_single_1b:
         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_b_single_1b:
+      network.incoming.packets.rate_b_single_1b_b_single_1b_t1_port_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_b_single_1b_1b_t1_port:
+      instance_b_single_1b:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -3581,49 +3614,43 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_b_single_1b_1b_t1_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.allocation_b_single_1b:
         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_b_single_1b_1b_t2_port:
+      network.outgoing.packets.rate_b_single_1b_b_single_1b_t2_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.capacity_b_single_1b:
+      network.outpoing.packets_b_single_1b_b_single_1b_t1_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.latency_b_single_1b:
+      network.outgoing.bytes_b_single_1b_b_single_1b_t2_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_b_single_1b_1b_t2_port:
+      disk.device.capacity_b_single_1b:
         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_b_single_1b_1b_t1_port:
+      disk.latency_b_single_1b:
         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_b_single_1b_1b_t1_port:
+      attachment_b_single_1b_b_single_1b_t1_port_0:
         type: tosca.capabilities.Attachment
         occurrences:
         - 1
@@ -3634,14 +3661,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      binding_b_single_1b_1b_t2_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.ephemeral.size_b_single_1b:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -3654,25 +3673,25 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_b_single_1b_1b_t2_port:
+      disk.device.iops_b_single_1b:
         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_b_single_1b:
+      disk.read.requests_b_single_1b:
         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_b_single_1b:
+      memory.resident_b_single_1b:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      memory.resident_b_single_1b:
+      network.outgoing.bytes.rate_b_single_1b_b_single_1b_t2_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:
@@ -3684,12 +3703,13 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      feature_b_single_1b_1b_t1_port:
-        type: tosca.capabilities.Node
+      network.incoming.packets_b_single_1b_b_single_1b_t1_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_b_single_1b_1b_t2_port:
+      network.outgoing.bytes.rate_b_single_1b_b_single_1b_t1_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:
@@ -3731,7 +3751,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_b_single_1b_1b_t1_port:
+      network.incoming.packets_b_single_1b_b_single_1b_t2_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:
@@ -3749,63 +3769,48 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_b_single_1b_1b_t1_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_b_single_1b:
         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_b_single_1b_1b_t1_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_b_single_1b_b_single_1b_t2_port_0:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      binding_b_single_1b_1b_t1_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
-      network.outpoing.packets_b_single_1b_1b_t1_port:
+      disk.device.write.requests.rate_b_single_1b:
         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_b_single_1b:
+      network.outgoing.packets.rate_b_single_1b_b_single_1b_t1_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.usage_b_single_1b:
+      network.outpoing.packets_b_single_1b_b_single_1b_t2_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.write.bytes.rate_b_single_1b:
+      memory.usage_b_single_1b:
         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_b_single_1b_1b_t2_port:
+      network.outgoing.bytes_b_single_1b_b_single_1b_t1_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_b_single_1b_1b_t1_port:
+      disk.write.bytes.rate_b_single_1b:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -3847,112 +3852,91 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      feature_b_single_1b_1b_t2_port:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
   org.openecomp.resource.abstract.nodes.1c1_scalling_instance:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
-      port_1c1_t1_port_exCP_naming:
-        type: org.openecomp.datatypes.Naming
-        required: true
-        status: SUPPORTED
-      port_1c1_t2_port_vlan_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
       compute_1c1_scalling_instance_user_data_format:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_1c1_t2_port_related_networks:
+      port_1c1_scalling_instance_t1_port_0_fixed_ips:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
-      port_1c1_t2_port_network_role_tag:
-        type: string
-        required: true
-        status: SUPPORTED
-      vm_flavor_name:
+          type: org.openecomp.datatypes.heat.neutron.port.FixedIps
+      port_1c1_scalling_instance_t1_port_0_network_role_tag:
         type: string
         required: true
         status: SUPPORTED
-      port_1c1_t1_port_related_networks:
+      port_1c1_scalling_instance_t2_port_0_related_networks:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
-      port_1c1_t1_port_ip_requirements:
+      port_1c1_scalling_instance_t1_port_0_network:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
-      vm_image_name:
+          type: string
+      vm_flavor_name:
         type: string
         required: true
         status: SUPPORTED
-      compute_1c1_scalling_instance_name:
+      port_1c1_scalling_instance_t2_port_0_fixed_ips:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
-      port_1c1_t1_port_name:
+          type: org.openecomp.datatypes.heat.neutron.port.FixedIps
+      port_1c1_scalling_instance_t1_port_0_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
-      port_1c1_t1_port_network:
-        type: list
+          type: org.openecomp.datatypes.network.IpRequirements
+      port_1c1_scalling_instance_t1_port_0_network_role:
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
-      port_1c1_t2_port_fixed_ips:
-        type: list
+      port_1c1_scalling_instance_t2_port_0_subnetpoolid:
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.heat.neutron.port.FixedIps
-      port_1c1_t2_port_network:
-        type: list
+      port_1c1_scalling_instance_t2_port_0_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
-      port_1c1_t1_port_fixed_ips:
-        type: list
+      vm_image_name:
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.heat.neutron.port.FixedIps
-      port_1c1_t1_port_vlan_requirements:
+      compute_1c1_scalling_instance_name:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
-      port_1c1_t2_port_ip_requirements:
-        type: list
+          type: string
+      port_1c1_scalling_instance_t2_port_0_network_role:
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
-      port_1c1_t1_port_mac_requirements:
+      port_1c1_scalling_instance_t1_port_0_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
         status: SUPPORTED
+      port_1c1_scalling_instance_t1_port_0_subnetpoolid:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_1c1_scalling_instance_t2_port_0_order:
+        type: integer
+        required: true
+        status: SUPPORTED
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
@@ -3961,76 +3945,92 @@ node_types:
         status: SUPPORTED
         constraints:
         - greater_or_equal: 0
-      port_1c1_t2_port_network_role:
-        type: string
+      port_1c1_scalling_instance_t1_port_0_order:
+        type: integer
         required: true
         status: SUPPORTED
-      port_1c1_t2_port_order:
-        type: integer
+      port_1c1_scalling_instance_t2_port_0_vlan_requirements:
+        type: list
         required: true
         status: SUPPORTED
-      port_1c1_t2_port_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
+        entry_schema:
+          type: org.openecomp.datatypes.network.VlanRequirements
+      port_1c1_scalling_instance_t1_port_0_name:
+        type: list
         required: true
         status: SUPPORTED
+        entry_schema:
+          type: string
       compute_1c1_scalling_instance_availability_zone:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_1c1_t2_port_subnetpoolid:
-        type: string
+      port_1c1_scalling_instance_t2_port_0_ip_requirements:
+        type: list
         required: true
         status: SUPPORTED
-      port_1c1_t2_port_name:
+        entry_schema:
+          type: org.openecomp.datatypes.network.IpRequirements
+      port_1c1_scalling_instance_t2_port_0_name:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
+      port_1c1_scalling_instance_t2_port_0_exCP_naming:
+        type: org.openecomp.datatypes.Naming
+        required: true
+        status: SUPPORTED
+      port_1c1_scalling_instance_t1_port_0_exCP_naming:
+        type: org.openecomp.datatypes.Naming
+        required: true
+        status: SUPPORTED
       compute_1c1_scalling_instance_scheduler_hints:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: json
-      port_1c1_t2_port_exCP_naming:
-        type: org.openecomp.datatypes.Naming
-        required: true
-        status: SUPPORTED
-      port_1c1_t1_port_subnetpoolid:
-        type: string
+      port_1c1_scalling_instance_t1_port_0_vlan_requirements:
+        type: list
         required: true
         status: SUPPORTED
-      port_1c1_t1_port_network_role_tag:
+        entry_schema:
+          type: org.openecomp.datatypes.network.VlanRequirements
+      port_1c1_scalling_instance_t2_port_0_network_role_tag:
         type: string
         required: true
         status: SUPPORTED
-      port_1c1_t1_port_network_role:
-        type: string
+      port_1c1_scalling_instance_t1_port_0_related_networks:
+        type: list
         required: true
         status: SUPPORTED
-      port_1c1_t1_port_order:
-        type: integer
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+      port_1c1_scalling_instance_t2_port_0_network:
+        type: list
         required: true
         status: SUPPORTED
+        entry_schema:
+          type: string
     attributes:
       1c1_scalling_instance_instance_name:
         type: string
         status: SUPPORTED
-      1c1_scalling_instance_1c1_t2_port_tenant_id:
+      1c1_scalling_instance_1c1_scalling_instance_t2_port_0_tenant_id:
         type: string
         status: SUPPORTED
     requirements:
-    - dependency_1c1_scalling_instance_1c1_t1_port:
+    - dependency_1c1_scalling_instance_1c1_scalling_instance_t2_port_0:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_1c1_scalling_instance_1c1_t1_port:
+    - link_1c1_scalling_instance_1c1_scalling_instance_t2_port_0:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
@@ -4050,14 +4050,14 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_1c1_scalling_instance_1c1_t2_port:
+    - dependency_1c1_scalling_instance_1c1_scalling_instance_t1_port_0:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_1c1_scalling_instance_1c1_t2_port:
+    - link_1c1_scalling_instance_1c1_scalling_instance_t1_port_0:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
@@ -4093,17 +4093,26 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_1c1_scalling_instance_1c1_t2_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_1c1_scalling_instance_1c1_scalling_instance_t2_port_0:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_1c1_scalling_instance_1c1_t2_port:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      binding_1c1_scalling_instance_1c1_scalling_instance_t1_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
+      binding_1c1_scalling_instance_1c1_scalling_instance_t2_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
       disk.usage_1c1_scalling_instance:
         type: org.openecomp.capabilities.metric.Ceilometer
@@ -4111,13 +4120,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      memory.resident_1c1_scalling_instance:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      forwarder_1c1_scalling_instance_1c1_scalling_instance_t2_port_0:
+        type: org.openecomp.capabilities.Forwarder
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_1c1_scalling_instance_1c1_t2_port:
+      memory.resident_1c1_scalling_instance:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -4129,7 +4137,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      forwarder_1c1_scalling_instance_1c1_t2_port:
+      forwarder_1c1_scalling_instance_1c1_scalling_instance_t1_port_0:
         type: org.openecomp.capabilities.Forwarder
         occurrences:
         - 1
@@ -4140,18 +4148,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_1c1_scalling_instance_1c1_t1_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.bytes_1c1_scalling_instance_1c1_t1_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.write.bytes.rate_1c1_scalling_instance:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -4164,7 +4160,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_1c1_scalling_instance_1c1_t1_port:
+      network.outgoing.bytes.rate_1c1_scalling_instance_1c1_scalling_instance_t1_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:
@@ -4175,24 +4171,19 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests.rate_1c1_scalling_instance:
+      network.outgoing.bytes.rate_1c1_scalling_instance_1c1_scalling_instance_t2_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
-      forwarder_1c1_scalling_instance_1c1_t1_port:
-        type: org.openecomp.capabilities.Forwarder
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.read.bytes.rate_1c1_scalling_instance:
+      disk.device.write.requests.rate_1c1_scalling_instance:
         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_1c1_scalling_instance_1c1_t2_port:
+      disk.read.bytes.rate_1c1_scalling_instance:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -4209,14 +4200,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      binding_1c1_scalling_instance_1c1_t2_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.device.write.bytes_1c1_scalling_instance:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -4229,19 +4212,13 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_1c1_scalling_instance_1c1_t2_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
       vcpus_1c1_scalling_instance:
         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_1c1_scalling_instance_1c1_t1_port:
+      network.incoming.packets_1c1_scalling_instance_1c1_scalling_instance_t2_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:
@@ -4254,33 +4231,38 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      network.outgoing.packets.rate_1c1_scalling_instance_1c1_scalling_instance_t1_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.write.requests_1c1_scalling_instance:
         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_1c1_scalling_instance_1c1_t1_port:
-        type: tosca.capabilities.Node
+      network.incoming.packets.rate_1c1_scalling_instance_1c1_scalling_instance_t1_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
-      binding_1c1_scalling_instance_1c1_t1_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
+      feature_1c1_scalling_instance_1c1_scalling_instance_t1_port_0:
+        type: tosca.capabilities.Node
         occurrences:
-        - 0
+        - 1
         - UNBOUNDED
-      disk.device.read.requests.rate_1c1_scalling_instance:
+      network.outpoing.packets_1c1_scalling_instance_1c1_scalling_instance_t2_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_1c1_scalling_instance_1c1_t2_port:
-        type: tosca.capabilities.Attachment
+      disk.device.read.requests.rate_1c1_scalling_instance:
+        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
@@ -4290,12 +4272,17 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_1c1_scalling_instance_1c1_t1_port:
+      network.incoming.bytes.rate_1c1_scalling_instance_1c1_scalling_instance_t1_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_1c1_scalling_instance_1c1_scalling_instance_t1_port_0:
+        type: tosca.capabilities.Attachment
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.iops_1c1_scalling_instance:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -4308,6 +4295,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      network.incoming.bytes_1c1_scalling_instance_1c1_scalling_instance_t2_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.capacity_1c1_scalling_instance:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -4326,6 +4319,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      network.outgoing.bytes_1c1_scalling_instance_1c1_scalling_instance_t2_port_0:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.read.requests_1c1_scalling_instance:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -4338,19 +4337,19 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests_1c1_scalling_instance:
+      network.outgoing.bytes_1c1_scalling_instance_1c1_scalling_instance_t1_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_1c1_scalling_instance_1c1_t1_port:
+      network.incoming.packets_1c1_scalling_instance_1c1_scalling_instance_t1_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_1c1_scalling_instance_1c1_t2_port:
+      disk.device.write.requests_1c1_scalling_instance:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -4373,70 +4372,71 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_1c1_scalling_instance_1c1_t1_port:
+      disk.allocation_1c1_scalling_instance:
         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.allocation_1c1_scalling_instance:
+      memory.usage_1c1_scalling_instance:
         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_1c1_scalling_instance_1c1_t2_port:
-        type: tosca.capabilities.Node
+      os_1c1_scalling_instance:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      memory.usage_1c1_scalling_instance:
+      disk.iops_1c1_scalling_instance:
         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_1c1_scalling_instance_1c1_t2_port:
+      network.outgoing.packets.rate_1c1_scalling_instance_1c1_scalling_instance_t2_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_1c1_scalling_instance_1c1_t2_port:
+      network.outpoing.packets_1c1_scalling_instance_1c1_scalling_instance_t1_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
-      os_1c1_scalling_instance:
-        type: tosca.capabilities.OperatingSystem
+      cpu.delta_1c1_scalling_instance:
+        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.iops_1c1_scalling_instance:
+      memory_1c1_scalling_instance:
         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_1c1_scalling_instance_1c1_t1_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_1c1_scalling_instance_1c1_scalling_instance_t2_port_0:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_1c1_scalling_instance_1c1_t1_port:
-        type: tosca.capabilities.Attachment
+      network.incoming.bytes.rate_1c1_scalling_instance_1c1_scalling_instance_t2_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
-      cpu.delta_1c1_scalling_instance:
+      network.incoming.bytes_1c1_scalling_instance_1c1_scalling_instance_t1_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_1c1_scalling_instance:
+      network.incoming.packets.rate_1c1_scalling_instance_1c1_scalling_instance_t2_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:
@@ -4451,41 +4451,39 @@ node_types:
   org.openecomp.resource.abstract.nodes.a_single_1a:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
-      port_1a_t1_port_ip_requirements:
+      port_a_single_1a_t1_port_0_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
-      port_1a_t2_port_network_role_tag:
-        type: string
-        required: true
-        status: SUPPORTED
-      vm_flavor_name:
-        type: string
+          type: org.openecomp.datatypes.network.VlanRequirements
+      port_a_single_1a_t1_port_0_order:
+        type: integer
         required: true
         status: SUPPORTED
-      port_1a_t2_port_network_role:
-        type: string
+      port_a_single_1a_t2_port_0_order:
+        type: integer
         required: true
         status: SUPPORTED
-      port_1a_t2_port_network:
+      port_a_single_1a_t2_port_0_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
-      port_1a_t1_port_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
+          type: org.openecomp.datatypes.network.VlanRequirements
+      vm_flavor_name:
+        type: string
         required: true
         status: SUPPORTED
-      port_1a_t1_port_network:
-        type: list
+      port_a_single_1a_t2_port_0_network_role_tag:
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
-      port_1a_t1_port_subnetpoolid:
+      port_a_single_1a_t1_port_0_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
+        required: true
+        status: SUPPORTED
+      port_a_single_1a_t1_port_0_subnetpoolid:
         type: string
         required: true
         status: SUPPORTED
@@ -4493,28 +4491,36 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
-      port_1a_t2_port_related_networks:
+      port_a_single_1a_t2_port_0_network:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
-      port_1a_t2_port_ip_requirements:
+          type: string
+      port_a_single_1a_t1_port_0_network_role_tag:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_a_single_1a_t1_port_0_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
-      port_1a_t1_port_vlan_requirements:
-        type: list
+      port_a_single_1a_t2_port_0_subnetpoolid:
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
-      port_1a_t1_port_exCP_naming:
-        type: org.openecomp.datatypes.Naming
+      port_a_single_1a_t2_port_0_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
+        required: true
+        status: SUPPORTED
+      port_a_single_1a_t1_port_0_network:
+        type: list
         required: true
         status: SUPPORTED
+        entry_schema:
+          type: string
       compute_a_single_1a_availability_zone:
         type: list
         required: true
@@ -4535,42 +4541,36 @@ node_types:
         status: SUPPORTED
         constraints:
         - greater_or_equal: 0
-      port_1a_t1_port_related_networks:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
-      port_1a_t1_port_network_role_tag:
+      port_a_single_1a_t1_port_0_network_role:
         type: string
         required: true
         status: SUPPORTED
-      port_1a_t1_port_network_role:
-        type: string
+      port_a_single_1a_t1_port_0_related_networks:
+        type: list
         required: true
         status: SUPPORTED
-      port_1a_t1_port_order:
-        type: integer
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+      port_a_single_1a_t1_port_0_exCP_naming:
+        type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
-      port_1a_t2_port_exCP_naming:
+      port_a_single_1a_t2_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
-      port_1a_t2_port_vlan_requirements:
+      port_a_single_1a_t2_port_0_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
-      port_1a_t2_port_subnetpoolid:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_1a_t2_port_order:
-        type: integer
+          type: org.openecomp.datatypes.network.IpRequirements
+      port_a_single_1a_t2_port_0_related_networks:
+        type: list
         required: true
         status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       compute_a_single_1a_user_data_format:
         type: list
         required: true
@@ -4583,26 +4583,26 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      port_1a_t2_port_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
+      port_a_single_1a_t2_port_0_network_role:
+        type: string
         required: true
         status: SUPPORTED
     attributes:
-      a_single_1a_instance_name:
+      a_single_1a_a_single_1a_t1_port_0_tenant_id:
         type: string
         status: SUPPORTED
-      a_single_1a_1a_t1_port_tenant_id:
+      a_single_1a_instance_name:
         type: string
         status: SUPPORTED
     requirements:
-    - dependency_a_single_1a_1a_t1_port:
+    - dependency_a_single_1a_a_single_1a_t2_port_0:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_a_single_1a_1a_t1_port:
+    - link_a_single_1a_a_single_1a_t2_port_0:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
@@ -4622,14 +4622,14 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_a_single_1a_1a_t2_port:
+    - dependency_a_single_1a_a_single_1a_t1_port_0:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_a_single_1a_1a_t2_port:
+    - link_a_single_1a_a_single_1a_t1_port_0:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
@@ -4642,29 +4642,36 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_a_single_1a_1a_t2_port:
+      disk.usage_a_single_1a:
         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_a_single_1a:
+      network.incoming.bytes.rate_a_single_1a_a_single_1a_t2_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_a_single_1a_1a_t2_port:
-        type: tosca.capabilities.Attachment
+      scalable_a_single_1a:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
-      scalable_a_single_1a:
-        type: tosca.capabilities.Scalable
+      network.incoming.packets.rate_a_single_1a_a_single_1a_t2_port_0:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.incoming.bytes_a_single_1a_a_single_1a_t2_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_a_single_1a_1a_t2_port:
+      network.incoming.bytes.rate_a_single_1a_a_single_1a_t1_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:
@@ -4694,44 +4701,38 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_a_single_1a_1a_t2_port:
+      cpu.delta_a_single_1a:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu.delta_a_single_1a:
+      network.incoming.bytes_a_single_1a_a_single_1a_t1_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
-      forwarder_a_single_1a_1a_t1_port:
-        type: org.openecomp.capabilities.Forwarder
-        occurrences:
-        - 1
-        - UNBOUNDED
       disk.device.write.requests_a_single_1a:
         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_a_single_1a_1a_t1_port:
+      disk.iops_a_single_1a:
         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.iops_a_single_1a:
+      network.outgoing.bytes_a_single_1a_a_single_1a_t2_port_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_a_single_1a_1a_t1_port:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      forwarder_a_single_1a_a_single_1a_t1_port_0:
+        type: org.openecomp.capabilities.Forwarder
         occurrences:
         - 1
         - UNBOUNDED
@@ -4752,15 +4753,8 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_a_single_1a_1a_t1_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.outgoing.packets.rate_a_single_1a_1a_t2_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_a_single_1a_a_single_1a_t1_port_0:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
@@ -4776,14 +4770,22 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      binding_a_single_1a_a_single_1a_t2_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
       disk.write.bytes.rate_a_single_1a:
         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_a_single_1a_1a_t1_port:
-        type: tosca.capabilities.Attachment
+      feature_a_single_1a_a_single_1a_t2_port_0:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
@@ -4799,8 +4801,9 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      forwarder_a_single_1a_1a_t2_port:
-        type: org.openecomp.capabilities.Forwarder
+      network.outpoing.packets_a_single_1a_a_single_1a_t1_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
@@ -4810,15 +4813,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      binding_a_single_1a_1a_t2_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
-      network.incoming.packets_a_single_1a_1a_t2_port:
+      network.outgoing.packets.rate_a_single_1a_a_single_1a_t2_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:
@@ -4853,12 +4848,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_a_single_1a_1a_t2_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.allocation_a_single_1a:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -4871,36 +4860,25 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      feature_a_single_1a_1a_t1_port:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      network.outpoing.packets_a_single_1a_1a_t2_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.outpoing.packets_a_single_1a_1a_t1_port:
+      disk.device.read.bytes.rate_a_single_1a:
         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.bytes.rate_a_single_1a:
+      disk.device.write.bytes_a_single_1a:
         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_a_single_1a:
+      disk.device.write.bytes.rate_a_single_1a:
         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_a_single_1a:
+      network.incoming.packets_a_single_1a_a_single_1a_t2_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:
@@ -4918,30 +4896,31 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_a_single_1a_1a_t1_port:
+      network.incoming.packets_a_single_1a_a_single_1a_t1_port_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_a_single_1a_1a_t2_port:
-        type: tosca.capabilities.Node
+      network.outgoing.bytes.rate_a_single_1a_a_single_1a_t2_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.capacity_a_single_1a:
+      network.outgoing.bytes.rate_a_single_1a_a_single_1a_t1_port_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes_a_single_1a:
+      disk.capacity_a_single_1a:
         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_a_single_1a_1a_t1_port:
+      disk.device.read.bytes_a_single_1a:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -4952,12 +4931,17 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_a_single_1a_1a_t1_port:
+      network.outgoing.bytes_a_single_1a_a_single_1a_t1_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
+      forwarder_a_single_1a_a_single_1a_t2_port_0:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.ephemeral.size_a_single_1a:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -4970,13 +4954,16 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      binding_a_single_1a_1a_t1_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
+      attachment_a_single_1a_a_single_1a_t2_port_0:
+        type: tosca.capabilities.Attachment
         occurrences:
-        - 0
+        - 1
+        - UNBOUNDED
+      network.incoming.packets.rate_a_single_1a_a_single_1a_t1_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.iops_a_single_1a:
         type: org.openecomp.capabilities.metric.Ceilometer
@@ -4990,31 +4977,44 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests.rate_a_single_1a:
+      network.outpoing.packets_a_single_1a_a_single_1a_t2_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.capacity_a_single_1a:
+      disk.device.read.requests.rate_a_single_1a:
         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_a_single_1a:
+      feature_a_single_1a_a_single_1a_t1_port_0:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.capacity_a_single_1a:
         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_a_single_1a_1a_t2_port:
+      binding_a_single_1a_a_single_1a_t1_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
+      disk.write.requests.rate_a_single_1a:
         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_a_single_1a_1a_t1_port:
+      network.outgoing.packets.rate_a_single_1a_a_single_1a_t1_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:
@@ -5023,43 +5023,55 @@ node_types:
   org.openecomp.resource.abstract.nodes.b_single_1b_1:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
-      port_1b_t1_port_order:
-        type: integer
+      port_b_single_1b_t1_port_0_network_role_tag:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_b_single_1b_t1_port_0_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+      port_b_single_1b_t2_port_0_subnetpoolid:
+        type: string
         required: true
         status: SUPPORTED
-      port_1b_t1_port_network_role:
+      port_b_single_1b_t1_port_0_network_role:
         type: string
         required: true
         status: SUPPORTED
-      port_1b_t1_port_exCP_naming:
-        type: org.openecomp.datatypes.Naming
+      port_b_single_1b_t2_port_0_network:
+        type: list
         required: true
         status: SUPPORTED
+        entry_schema:
+          type: string
       vm_flavor_name:
         type: string
         required: true
         status: SUPPORTED
-      port_1b_t2_port_related_networks:
+      port_b_single_1b_t1_port_0_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
-      port_1b_t1_port_ip_requirements:
+          type: org.openecomp.datatypes.network.VlanRequirements
+      port_b_single_1b_t2_port_0_related_networks:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vm_image_name:
         type: string
         required: true
         status: SUPPORTED
-      port_1b_t2_port_network_role:
-        type: string
+      port_b_single_1b_t2_port_0_order:
+        type: integer
         required: true
         status: SUPPORTED
-      port_1b_t2_port_order:
+      port_b_single_1b_t1_port_0_order:
         type: integer
         required: true
         status: SUPPORTED
@@ -5069,34 +5081,32 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      port_1b_t2_port_exCP_naming:
-        type: org.openecomp.datatypes.Naming
-        required: true
-        status: SUPPORTED
-      port_1b_t2_port_network_role_tag:
-        type: string
+      port_b_single_1b_t2_port_0_vlan_requirements:
+        type: list
         required: true
         status: SUPPORTED
-      port_1b_t2_port_subnetpoolid:
+        entry_schema:
+          type: org.openecomp.datatypes.network.VlanRequirements
+      port_b_single_1b_t2_port_0_network_role:
         type: string
         required: true
         status: SUPPORTED
-      port_1b_t1_port_related_networks:
+      port_b_single_1b_t1_port_0_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
-      port_1b_t2_port_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
-        required: true
-        status: SUPPORTED
+          type: org.openecomp.datatypes.network.IpRequirements
       compute_b_single_1b_availability_zone:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
+      port_b_single_1b_t1_port_0_exCP_naming:
+        type: org.openecomp.datatypes.Naming
+        required: true
+        status: SUPPORTED
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
@@ -5111,48 +5121,38 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: json
-      port_1b_t2_port_vlan_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
-      port_1b_t2_port_ip_requirements:
-        type: list
+      port_b_single_1b_t1_port_0_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
-      port_1b_t1_port_network_role_tag:
+      port_b_single_1b_t1_port_0_subnetpoolid:
         type: string
         required: true
         status: SUPPORTED
-      port_1b_t1_port_subnetpoolid:
+      port_b_single_1b_t2_port_0_network_role_tag:
         type: string
         required: true
         status: SUPPORTED
-      port_1b_t1_port_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
-        required: true
-        status: SUPPORTED
-      port_1b_t2_port_network:
+      port_b_single_1b_t1_port_0_network:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_1b_t1_port_vlan_requirements:
+      port_b_single_1b_t2_port_0_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
-      port_1b_t1_port_network:
-        type: list
+          type: org.openecomp.datatypes.network.IpRequirements
+      port_b_single_1b_t2_port_0_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
+        required: true
+        status: SUPPORTED
+      port_b_single_1b_t2_port_0_exCP_naming:
+        type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       compute_b_single_1b_name:
         type: list
         required: true
@@ -5163,7 +5163,7 @@ node_types:
       b_single_1b_instance_name:
         type: string
         status: SUPPORTED
-      b_single_1b_1b_t1_port_tenant_id:
+      b_single_1b_b_single_1b_t1_port_0_tenant_id:
         type: string
         status: SUPPORTED
     requirements:
@@ -5181,43 +5181,33 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_b_single_1b_1b_t1_port:
+    - dependency_b_single_1b_b_single_1b_t2_port_0:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_b_single_1b_1b_t1_port:
+    - link_b_single_1b_b_single_1b_t2_port_0:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
         - 1
         - 1
-    - dependency_b_single_1b_1b_t2_port:
+    - dependency_b_single_1b_b_single_1b_t1_port_0:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_b_single_1b_1b_t2_port:
+    - link_b_single_1b_b_single_1b_t1_port_0:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
         - 1
         - 1
     capabilities:
-      attachment_b_single_1b_1b_t2_port:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
-      forwarder_b_single_1b_1b_t2_port:
-        type: org.openecomp.capabilities.Forwarder
-        occurrences:
-        - 1
-        - UNBOUNDED
       endpoint_b_single_1b:
         type: tosca.capabilities.Endpoint.Admin
         occurrences:
@@ -5234,23 +5224,56 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_b_single_1b_1b_t2_port:
+      network.incoming.bytes_b_single_1b_b_single_1b_t1_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_b_single_1b_1b_t2_port:
+      network.incoming.packets.rate_b_single_1b_b_single_1b_t2_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
-      forwarder_b_single_1b_1b_t1_port:
-        type: org.openecomp.capabilities.Forwarder
+      network.incoming.bytes_b_single_1b_b_single_1b_t2_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
+      binding_b_single_1b_b_single_1b_t1_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
+      feature_b_single_1b_b_single_1b_t2_port_0:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      feature_b_single_1b_b_single_1b_t1_port_0:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.incoming.bytes.rate_b_single_1b_b_single_1b_t1_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
+      binding_b_single_1b_b_single_1b_t2_port_0:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
       scalable_b_single_1b:
         type: tosca.capabilities.Scalable
         occurrences:
@@ -5267,6 +5290,16 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_b_single_1b_b_single_1b_t2_port_0:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      forwarder_b_single_1b_b_single_1b_t1_port_0:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       vcpus_b_single_1b:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -5279,25 +5312,25 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests.rate_b_single_1b:
+      network.incoming.bytes.rate_b_single_1b_b_single_1b_t2_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_b_single_1b_1b_t2_port:
+      disk.device.read.requests.rate_b_single_1b:
         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_b_single_1b:
+      network.incoming.packets.rate_b_single_1b_b_single_1b_t1_port_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_b_single_1b_1b_t1_port:
+      instance_b_single_1b:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -5321,49 +5354,43 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_b_single_1b_1b_t1_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.allocation_b_single_1b:
         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_b_single_1b_1b_t2_port:
+      network.outgoing.packets.rate_b_single_1b_b_single_1b_t2_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.capacity_b_single_1b:
+      network.outpoing.packets_b_single_1b_b_single_1b_t1_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.latency_b_single_1b:
+      network.outgoing.bytes_b_single_1b_b_single_1b_t2_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_b_single_1b_1b_t2_port:
+      disk.device.capacity_b_single_1b:
         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_b_single_1b_1b_t1_port:
+      disk.latency_b_single_1b:
         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_b_single_1b_1b_t1_port:
+      attachment_b_single_1b_b_single_1b_t1_port_0:
         type: tosca.capabilities.Attachment
         occurrences:
         - 1
@@ -5374,14 +5401,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      binding_b_single_1b_1b_t2_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.ephemeral.size_b_single_1b:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -5394,25 +5413,25 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_b_single_1b_1b_t2_port:
+      disk.device.iops_b_single_1b:
         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_b_single_1b:
+      disk.read.requests_b_single_1b:
         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_b_single_1b:
+      memory.resident_b_single_1b:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      memory.resident_b_single_1b:
+      network.outgoing.bytes.rate_b_single_1b_b_single_1b_t2_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:
@@ -5424,12 +5443,13 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      feature_b_single_1b_1b_t1_port:
-        type: tosca.capabilities.Node
+      network.incoming.packets_b_single_1b_b_single_1b_t1_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_b_single_1b_1b_t2_port:
+      network.outgoing.bytes.rate_b_single_1b_b_single_1b_t1_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:
@@ -5471,7 +5491,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_b_single_1b_1b_t1_port:
+      network.incoming.packets_b_single_1b_b_single_1b_t2_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:
@@ -5489,63 +5509,48 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_b_single_1b_1b_t1_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_b_single_1b:
         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_b_single_1b_1b_t1_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_b_single_1b_b_single_1b_t2_port_0:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      binding_b_single_1b_1b_t1_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
-      network.outpoing.packets_b_single_1b_1b_t1_port:
+      disk.device.write.requests.rate_b_single_1b:
         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_b_single_1b:
+      network.outgoing.packets.rate_b_single_1b_b_single_1b_t1_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.usage_b_single_1b:
+      network.outpoing.packets_b_single_1b_b_single_1b_t2_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.write.bytes.rate_b_single_1b:
+      memory.usage_b_single_1b:
         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_b_single_1b_1b_t2_port:
+      network.outgoing.bytes_b_single_1b_b_single_1b_t1_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_b_single_1b_1b_t1_port:
+      disk.write.bytes.rate_b_single_1b:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -5587,11 +5592,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      feature_b_single_1b_1b_t2_port:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
   org.openecomp.resource.abstract.nodes.heat.nested-no-nova:
     derived_from: org.openecomp.resource.abstract.nodes.AbstractSubstitute
     properties:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/MainServiceTemplate.yaml
index a7aec720a7..7a0d3d0944 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/MainServiceTemplate.yaml
@@ -243,36 +243,36 @@ topology_template:
       directives:
       - substitutable
       properties:
+        port_b_single_1b_t2_port_0_network:
+        - b_single_1b_network
         vm_flavor_name:
           get_input: pd_flavor_name
-        port_1b_t1_port_ip_requirements:
-        - ip_version: 4
-          ip_count_required:
-            is_required: false
-          floating_ip_count_required:
-            is_required: false
         vm_image_name:
           get_input: pd_image_name
         compute_b_single_1b_user_data_format:
         - RAW
-        port_1b_t2_port_mac_requirements:
-          mac_count_required:
+        port_b_single_1b_t1_port_0_ip_requirements:
+        - ip_version: 4
+          ip_count_required:
+            is_required: false
+          floating_ip_count_required:
             is_required: false
         compute_b_single_1b_availability_zone:
         - get_input: availabilityzone_name
         compute_b_single_1b_scheduler_hints:
         - group: BE_Affinity_group
-        port_1b_t2_port_ip_requirements:
+        port_b_single_1b_t1_port_0_mac_requirements:
+          mac_count_required:
+            is_required: false
+        port_b_single_1b_t2_port_0_ip_requirements:
         - ip_version: 4
           ip_count_required:
             is_required: false
           floating_ip_count_required:
             is_required: false
-        port_1b_t1_port_mac_requirements:
+        port_b_single_1b_t2_port_0_mac_requirements:
           mac_count_required:
             is_required: false
-        port_1b_t2_port_network:
-        - b_single_1b_network
         compute_b_single_1b_name:
         - get_input:
           - b_single_1b_names
@@ -286,7 +286,7 @@ topology_template:
           - service_template_filter
           - index_value
       requirements:
-      - link_b_single_1b_1b_t2_port:
+      - link_b_single_1b_b_single_1b_t2_port_0:
           capability: tosca.capabilities.network.Linkable
           node: b_single_1b_network
           relationship: tosca.relationships.network.LinksTo
@@ -298,31 +298,7 @@ topology_template:
         compute_1c1_scalling_instance_user_data_format:
         - RAW2
         - RAW1
-        port_1c1_t2_port_network_role_tag: ppds
-        vm_flavor_name:
-          get_input: pd_flavor_name
-        port_1c1_t1_port_ip_requirements:
-        - ip_version: 4
-          ip_count_required:
-            is_required: true
-          floating_ip_count_required:
-            is_required: false
-        vm_image_name:
-          get_input: pd_image_name
-        compute_1c1_scalling_instance_name:
-        - get_input:
-          - 1c1_scalling_instance_names
-          - 2
-        - get_input:
-          - 1c1_scalling_instance_names
-          - 1
-        port_1c1_t1_port_name:
-        - 1c1_t1_port_1
-        - 1c1_t1_port_0
-        port_1c1_t1_port_network:
-        - 1c1_scalling_instance_network
-        - 1c1_scalling_instance_network
-        port_1c1_t2_port_fixed_ips:
+        port_1c1_scalling_instance_t1_port_0_fixed_ips:
         - - ip_address:
               get_input:
               - myIPs
@@ -331,10 +307,12 @@ topology_template:
               get_input:
               - myIPs
               - 1
-        port_1c1_t2_port_network:
-        - get_input: ppds_net_name
-        - get_input: ppds_net_name
-        port_1c1_t1_port_fixed_ips:
+        port_1c1_scalling_instance_t1_port_0_network:
+        - 1c1_scalling_instance_network
+        - 1c1_scalling_instance_network
+        vm_flavor_name:
+          get_input: pd_flavor_name
+        port_1c1_scalling_instance_t2_port_0_fixed_ips:
         - - ip_address:
               get_input:
               - myIPs
@@ -343,27 +321,49 @@ topology_template:
               get_input:
               - myIPs
               - 1
-        port_1c1_t2_port_ip_requirements:
+        port_1c1_scalling_instance_t1_port_0_ip_requirements:
         - ip_version: 4
           ip_count_required:
             is_required: true
           floating_ip_count_required:
             is_required: false
-        port_1c1_t1_port_mac_requirements:
+        port_1c1_scalling_instance_t2_port_0_mac_requirements:
           mac_count_required:
             is_required: false
-        port_1c1_t2_port_mac_requirements:
+        vm_image_name:
+          get_input: pd_image_name
+        compute_1c1_scalling_instance_name:
+        - get_input:
+          - 1c1_scalling_instance_names
+          - 2
+        - get_input:
+          - 1c1_scalling_instance_names
+          - 1
+        port_1c1_scalling_instance_t1_port_0_mac_requirements:
           mac_count_required:
             is_required: false
+        port_1c1_scalling_instance_t1_port_0_name:
+        - 1c1_scalling_instance_1_t1_port_0
+        - 1c1_scalling_instance_0_t1_port_0
         compute_1c1_scalling_instance_availability_zone:
         - get_input: availabilityzone_name
         - get_input: availabilityzone_name
-        port_1c1_t2_port_name:
-        - 1c1_t2_port_1
-        - 1c1_t2_port_0
+        port_1c1_scalling_instance_t2_port_0_ip_requirements:
+        - ip_version: 4
+          ip_count_required:
+            is_required: true
+          floating_ip_count_required:
+            is_required: false
+        port_1c1_scalling_instance_t2_port_0_name:
+        - 1c1_scalling_instance_1_t2_port_0
+        - 1c1_scalling_instance_0_t2_port_0
         compute_1c1_scalling_instance_scheduler_hints:
         - group: BE_Affinity_group
         - group: BE_Affinity_group
+        port_1c1_scalling_instance_t2_port_0_network_role_tag: ppds
+        port_1c1_scalling_instance_t2_port_0_network:
+        - get_input: ppds_net_name
+        - get_input: ppds_net_name
         service_template_filter:
           substitute_service_template: Nested_1c1_scalling_instanceServiceTemplate.yaml
           count: 2
@@ -373,7 +373,7 @@ topology_template:
           - service_template_filter
           - index_value
       requirements:
-      - link_1c1_scalling_instance_1c1_t1_port:
+      - link_1c1_scalling_instance_1c1_scalling_instance_t1_port_0:
           capability: tosca.capabilities.network.Linkable
           node: 1c1_scalling_instance_network
           relationship: tosca.relationships.network.LinksTo
@@ -439,41 +439,41 @@ topology_template:
       directives:
       - substitutable
       properties:
+        port_1c2_catalog_instance_t1_port_0_network:
+        - get_input: oam_net_name
         compute_1c2_catalog_instance_availability_zone:
         - get_input: availabilityzone_name
-        vm_flavor_name:
-          get_input: pd_flavor_name
-        vm_image_name:
-          get_input: pd_image_name
-        port_1c2_t2_port_ip_requirements:
+        port_1c2_catalog_instance_t1_port_0_ip_requirements:
         - ip_version: 4
           ip_count_required:
             is_required: false
           floating_ip_count_required:
             is_required: false
-        port_1c2_t1_port_mac_requirements:
+        vm_flavor_name:
+          get_input: pd_flavor_name
+        port_1c2_catalog_instance_t2_port_0_network:
+        - 1c2_catalog_instance_network
+        vm_image_name:
+          get_input: pd_image_name
+        port_1c2_catalog_instance_t1_port_0_mac_requirements:
+          mac_count_required:
+            is_required: false
+        port_1c2_catalog_instance_t2_port_0_mac_requirements:
           mac_count_required:
             is_required: false
-        port_1c2_t2_port_network:
-        - 1c2_catalog_instance_network
         compute_1c2_catalog_instance_name:
         - get_input:
           - 1c2_catalog_instance_names
           - 1
-        port_1c2_t1_port_network:
-        - get_input: oam_net_name
-        port_1c2_t2_port_mac_requirements:
-          mac_count_required:
-            is_required: false
-        compute_1c2_catalog_instance_user_data_format:
-        - RAW1
-        port_1c2_t1_port_network_role_tag: oam
-        port_1c2_t1_port_ip_requirements:
+        port_1c2_catalog_instance_t2_port_0_ip_requirements:
         - ip_version: 4
           ip_count_required:
             is_required: false
           floating_ip_count_required:
             is_required: false
+        compute_1c2_catalog_instance_user_data_format:
+        - RAW1
+        port_1c2_catalog_instance_t1_port_0_network_role_tag: oam
         compute_1c2_catalog_instance_scheduler_hints:
         - group: BE_Affinity_group
         service_template_filter:
@@ -485,7 +485,7 @@ topology_template:
           - service_template_filter
           - index_value
       requirements:
-      - link_1c2_catalog_instance_1c2_t2_port:
+      - link_1c2_catalog_instance_1c2_catalog_instance_t2_port_0:
           capability: tosca.capabilities.network.Linkable
           node: 1c2_catalog_instance_network
           relationship: tosca.relationships.network.LinksTo
@@ -494,43 +494,43 @@ topology_template:
       directives:
       - substitutable
       properties:
+        port_1c2_catalog_instance_t1_port_0_network:
+        - get_input: oam_net_name
         compute_1c2_catalog_instance_availability_zone:
         - get_input: availabilityzone_name
-        vm_flavor_name:
-          get_input: pd_flavor_name
-        vm_image_name:
-          get_input: pd_image_name
-        port_1c2_t2_port_ip_requirements:
+        port_1c2_catalog_instance_t1_port_0_ip_requirements:
         - ip_version: 4
           ip_count_required:
             is_required: false
           floating_ip_count_required:
             is_required: false
-        port_1c2_t1_port_mac_requirements:
+        vm_flavor_name:
+          get_input: pd_flavor_name
+        port_1c2_catalog_instance_t2_port_0_network:
+        - 1c2_catalog_instance_network
+        vm_image_name:
+          get_input: pd_image_name
+        port_1c2_catalog_instance_t1_port_0_mac_requirements:
+          mac_count_required:
+            is_required: false
+        port_1c2_catalog_instance_t2_port_0_mac_requirements:
           mac_count_required:
             is_required: false
-        port_1c2_t2_port_network:
-        - 1c2_catalog_instance_network
         compute_1c2_catalog_instance_name:
         - get_input:
           - 1c2_catalog_instance_names
           - 2
-        port_1c2_t1_port_network:
-        - get_input: oam_net_name
-        port_1c2_t2_port_mac_requirements:
-          mac_count_required:
-            is_required: false
-        compute_1c2_catalog_instance_user_data_format:
-        - get_attribute:
-          - abstract_1c2_catalog_instance_0
-          - 1c2_catalog_instance_instance_name
-        port_1c2_t1_port_network_role_tag: oam
-        port_1c2_t1_port_ip_requirements:
+        port_1c2_catalog_instance_t2_port_0_ip_requirements:
         - ip_version: 4
           ip_count_required:
             is_required: false
           floating_ip_count_required:
             is_required: false
+        compute_1c2_catalog_instance_user_data_format:
+        - get_attribute:
+          - abstract_1c2_catalog_instance_0
+          - 1c2_catalog_instance_instance_name
+        port_1c2_catalog_instance_t1_port_0_network_role_tag: oam
         compute_1c2_catalog_instance_scheduler_hints:
         - group: BE_Affinity_group
         service_template_filter:
@@ -542,7 +542,7 @@ topology_template:
           - service_template_filter
           - index_value
       requirements:
-      - link_1c2_catalog_instance_1c2_t2_port:
+      - link_1c2_catalog_instance_1c2_catalog_instance_t2_port_0:
           capability: tosca.capabilities.network.Linkable
           node: 1c2_catalog_instance_network
           relationship: tosca.relationships.network.LinksTo
@@ -566,10 +566,10 @@ topology_template:
         dhcp_agent_ids:
           get_attribute:
           - abstract_1c2_catalog_instance_1
-          - 1c2_catalog_instance_1c2_t1_port_tenant_id
+          - 1c2_catalog_instance_1c2_catalog_instance_t1_port_0_tenant_id
           - get_attribute:
             - abstract_1c2_catalog_instance_0
-            - 1c2_catalog_instance_1c2_t1_port_tenant_id
+            - 1c2_catalog_instance_1c2_catalog_instance_t1_port_0_tenant_id
             - get_attribute:
               - abstract_1c2_catalog_instance_0
               - 1c2_catalog_instance_instance_name
@@ -585,14 +585,14 @@ topology_template:
             - 1c1_scalling_instance_instance_name
             - get_attribute:
               - abstract_1c1_scalling_instance
-              - 1c1_scalling_instance_1c1_t2_port_tenant_id
+              - 1c1_scalling_instance_1c1_scalling_instance_t2_port_0_tenant_id
               - get_attribute:
                 - abstract_1c1_scalling_instance
-                - 1c1_scalling_instance_1c1_t2_port_tenant_id
+                - 1c1_scalling_instance_1c1_scalling_instance_t2_port_0_tenant_id
         admin_state_up:
           get_attribute:
           - abstract_a_single_1a
-          - a_single_1a_1a_t1_port_tenant_id
+          - a_single_1a_a_single_1a_t1_port_0_tenant_id
         qos_policy:
           get_attribute:
           - abstract_a_single_1a
@@ -613,10 +613,10 @@ topology_template:
             - b_single_1b_instance_name
             - get_attribute:
               - abstract_b_single_1b
-              - b_single_1b_1b_t1_port_tenant_id
+              - b_single_1b_b_single_1b_t1_port_0_tenant_id
               - get_attribute:
                 - abstract_b_single_1b_1
-                - b_single_1b_1b_t1_port_tenant_id
+                - b_single_1b_b_single_1b_t1_port_0_tenant_id
     dependsOn_network:
       type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net
       properties:
@@ -624,11 +624,11 @@ topology_template:
           get_input: net_name
       requirements:
       - dependency:
-          capability: feature_1c2_catalog_instance_1c2_t1_port
+          capability: feature_1c2_catalog_instance_1c2_catalog_instance_t1_port_0
           node: abstract_1c2_catalog_instance_1
           relationship: tosca.relationships.DependsOn
       - dependency:
-          capability: feature_1c2_catalog_instance_1c2_t1_port
+          capability: feature_1c2_catalog_instance_1c2_catalog_instance_t1_port_0
           node: abstract_1c2_catalog_instance_0
           relationship: tosca.relationships.DependsOn
       - dependency:
@@ -644,7 +644,7 @@ topology_template:
           node: abstract_1c1_scalling_instance
           relationship: tosca.relationships.DependsOn
       - dependency:
-          capability: feature_1c1_scalling_instance_1c1_t2_port
+          capability: feature_1c1_scalling_instance_1c1_scalling_instance_t2_port_0
           node: abstract_1c1_scalling_instance
           relationship: tosca.relationships.DependsOn
       - dependency:
@@ -656,11 +656,11 @@ topology_template:
           node: abstract_b_single_1b_1
           relationship: tosca.relationships.DependsOn
       - dependency:
-          capability: feature_b_single_1b_1b_t1_port
+          capability: feature_b_single_1b_b_single_1b_t1_port_0
           node: abstract_b_single_1b
           relationship: tosca.relationships.DependsOn
       - dependency:
-          capability: feature_b_single_1b_1b_t1_port
+          capability: feature_b_single_1b_b_single_1b_t1_port_0
           node: abstract_b_single_1b_1
           relationship: tosca.relationships.DependsOn
       - dependency:
@@ -668,7 +668,7 @@ topology_template:
           node: abstract_a_single_1a
           relationship: tosca.relationships.DependsOn
       - dependency:
-          capability: feature_a_single_1a_1a_t1_port
+          capability: feature_a_single_1a_a_single_1a_t1_port_0
           node: abstract_a_single_1a
           relationship: tosca.relationships.DependsOn
     abstract_a_single_1a:
@@ -676,43 +676,43 @@ topology_template:
       directives:
       - substitutable
       properties:
-        port_1a_t1_port_ip_requirements:
-        - ip_version: 4
-          ip_count_required:
-            is_required: false
-          floating_ip_count_required:
-            is_required: false
-        port_1a_t2_port_network_role_tag: ppds
         vm_flavor_name:
           get_input: pd_flavor_name
-        port_1a_t2_port_network:
-        - get_input: ppds_net_name
-        port_1a_t1_port_mac_requirements:
+        port_a_single_1a_t2_port_0_network_role_tag: ppds
+        port_a_single_1a_t1_port_0_mac_requirements:
           mac_count_required:
             is_required: false
-        port_1a_t1_port_network:
-        - a_single_1a_network
         vm_image_name:
           get_input: pd_image_name
-        port_1a_t2_port_ip_requirements:
+        port_a_single_1a_t2_port_0_network:
+        - get_input: ppds_net_name
+        port_a_single_1a_t1_port_0_ip_requirements:
         - ip_version: 4
           ip_count_required:
             is_required: false
           floating_ip_count_required:
             is_required: false
+        port_a_single_1a_t2_port_0_mac_requirements:
+          mac_count_required:
+            is_required: false
+        port_a_single_1a_t1_port_0_network:
+        - a_single_1a_network
         compute_a_single_1a_availability_zone:
         - get_input: availabilityzone_name
         compute_a_single_1a_scheduler_hints:
         - group: BE_Affinity_group
+        port_a_single_1a_t2_port_0_ip_requirements:
+        - ip_version: 4
+          ip_count_required:
+            is_required: false
+          floating_ip_count_required:
+            is_required: false
         compute_a_single_1a_user_data_format:
         - RAW
         compute_a_single_1a_name:
         - get_input:
           - a_single_1a_names
           - 0
-        port_1a_t2_port_mac_requirements:
-          mac_count_required:
-            is_required: false
         service_template_filter:
           substitute_service_template: Nested_a_single_1aServiceTemplate.yaml
           count: 1
@@ -722,7 +722,7 @@ topology_template:
           - service_template_filter
           - index_value
       requirements:
-      - link_a_single_1a_1a_t1_port:
+      - link_a_single_1a_a_single_1a_t1_port_0:
           capability: tosca.capabilities.network.Linkable
           node: a_single_1a_network
           relationship: tosca.relationships.network.LinksTo
@@ -832,39 +832,39 @@ topology_template:
       directives:
       - substitutable
       properties:
+        port_b_single_1b_t1_port_0_network_role_tag: oam
+        port_b_single_1b_t2_port_0_network:
+        - b_single_1b_network
         vm_flavor_name:
           get_input: pd_flavor_name
-        port_1b_t1_port_ip_requirements:
-        - ip_version: 4
-          ip_count_required:
-            is_required: false
-          floating_ip_count_required:
-            is_required: false
         vm_image_name:
           get_input: pd_image_name
         compute_b_single_1b_user_data_format:
         - RAW
-        port_1b_t2_port_mac_requirements:
-          mac_count_required:
+        port_b_single_1b_t1_port_0_ip_requirements:
+        - ip_version: 4
+          ip_count_required:
+            is_required: false
+          floating_ip_count_required:
             is_required: false
         compute_b_single_1b_availability_zone:
         - get_input: availabilityzone_name
         compute_b_single_1b_scheduler_hints:
         - group: BE_Affinity_group
-        port_1b_t2_port_ip_requirements:
+        port_b_single_1b_t1_port_0_mac_requirements:
+          mac_count_required:
+            is_required: false
+        port_b_single_1b_t1_port_0_network:
+        - get_input: oam_net_name
+        port_b_single_1b_t2_port_0_ip_requirements:
         - ip_version: 4
           ip_count_required:
             is_required: false
           floating_ip_count_required:
             is_required: false
-        port_1b_t1_port_network_role_tag: oam
-        port_1b_t1_port_mac_requirements:
+        port_b_single_1b_t2_port_0_mac_requirements:
           mac_count_required:
             is_required: false
-        port_1b_t2_port_network:
-        - b_single_1b_network
-        port_1b_t1_port_network:
-        - get_input: oam_net_name
         compute_b_single_1b_name:
         - get_input:
           - b_single_1b_names
@@ -878,7 +878,7 @@ topology_template:
           - service_template_filter
           - index_value
       requirements:
-      - link_b_single_1b_1b_t2_port:
+      - link_b_single_1b_b_single_1b_t2_port_0:
           capability: tosca.capabilities.network.Linkable
           node: b_single_1b_network
           relationship: tosca.relationships.network.LinksTo
@@ -931,10 +931,10 @@ topology_template:
       value:
         get_attribute:
         - abstract_1c2_catalog_instance_1
-        - 1c2_catalog_instance_1c2_t1_port_tenant_id
+        - 1c2_catalog_instance_1c2_catalog_instance_t1_port_0_tenant_id
         - get_attribute:
           - abstract_1c2_catalog_instance_0
-          - 1c2_catalog_instance_1c2_t1_port_tenant_id
+          - 1c2_catalog_instance_1c2_catalog_instance_t1_port_0_tenant_id
           - get_attribute:
             - abstract_1c2_catalog_instance_0
             - 1c2_catalog_instance_instance_name
@@ -951,10 +951,10 @@ topology_template:
           - 1c1_scalling_instance_instance_name
           - get_attribute:
             - abstract_1c1_scalling_instance
-            - 1c1_scalling_instance_1c1_t2_port_tenant_id
+            - 1c1_scalling_instance_1c1_scalling_instance_t2_port_0_tenant_id
             - get_attribute:
               - abstract_1c1_scalling_instance
-              - 1c1_scalling_instance_1c1_t2_port_tenant_id
+              - 1c1_scalling_instance_1c1_scalling_instance_t2_port_0_tenant_id
     out4:
       value:
         get_attribute:
@@ -965,10 +965,10 @@ topology_template:
           - b_single_1b_instance_name
           - get_attribute:
             - abstract_b_single_1b
-            - b_single_1b_1b_t1_port_tenant_id
+            - b_single_1b_b_single_1b_t1_port_0_tenant_id
             - get_attribute:
               - abstract_b_single_1b_1
-              - b_single_1b_1b_t1_port_tenant_id
+              - b_single_1b_b_single_1b_t1_port_0_tenant_id
     out5:
       value:
         get_attribute:
@@ -986,7 +986,7 @@ topology_template:
       value:
         get_attribute:
         - abstract_a_single_1a
-        - a_single_1a_1a_t1_port_tenant_id
+        - a_single_1a_a_single_1a_t1_port_0_tenant_id
     out7:
       value:
         get_attribute:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c1_scalling_instanceServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c1_scalling_instanceServiceTemplate.yaml
index 15620d7809..5be7399e92 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c1_scalling_instanceServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c1_scalling_instanceServiceTemplate.yaml
@@ -11,86 +11,71 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
-    port_1c1_t1_port_exCP_naming:
-      type: org.openecomp.datatypes.Naming
-      required: true
-    port_1c1_t2_port_vlan_requirements:
-      type: list
-      required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.VlanRequirements
     compute_1c1_scalling_instance_user_data_format:
       type: list
       required: true
       entry_schema:
         type: string
-    port_1c1_t2_port_related_networks:
+    port_1c1_scalling_instance_t1_port_0_fixed_ips:
       type: list
       required: true
       entry_schema:
-        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
-    port_1c1_t2_port_network_role_tag:
-      type: string
-      required: true
-    vm_flavor_name:
+        type: org.openecomp.datatypes.heat.neutron.port.FixedIps
+    port_1c1_scalling_instance_t1_port_0_network_role_tag:
       type: string
       required: true
-    port_1c1_t1_port_related_networks:
+    port_1c1_scalling_instance_t2_port_0_related_networks:
       type: list
       required: true
       entry_schema:
         type: org.openecomp.datatypes.network.RelatedNetworksAssignments
-    port_1c1_t1_port_ip_requirements:
+    port_1c1_scalling_instance_t1_port_0_network:
       type: list
       required: true
       entry_schema:
-        type: org.openecomp.datatypes.network.IpRequirements
-    vm_image_name:
+        type: string
+    vm_flavor_name:
       type: string
       required: true
-    compute_1c1_scalling_instance_name:
+    port_1c1_scalling_instance_t2_port_0_fixed_ips:
       type: list
       required: true
       entry_schema:
-        type: string
-    port_1c1_t1_port_name:
+        type: org.openecomp.datatypes.heat.neutron.port.FixedIps
+    port_1c1_scalling_instance_t1_port_0_ip_requirements:
       type: list
       required: true
       entry_schema:
-        type: string
-    port_1c1_t1_port_network:
-      type: list
+        type: org.openecomp.datatypes.network.IpRequirements
+    port_1c1_scalling_instance_t1_port_0_network_role:
+      type: string
       required: true
-      entry_schema:
-        type: string
-    port_1c1_t2_port_fixed_ips:
-      type: list
+    port_1c1_scalling_instance_t2_port_0_subnetpoolid:
+      type: string
       required: true
-      entry_schema:
-        type: org.openecomp.datatypes.heat.neutron.port.FixedIps
-    port_1c1_t2_port_network:
-      type: list
+    port_1c1_scalling_instance_t2_port_0_mac_requirements:
+      type: org.openecomp.datatypes.network.MacRequirements
       required: true
-      entry_schema:
-        type: string
-    port_1c1_t1_port_fixed_ips:
-      type: list
+    vm_image_name:
+      type: string
       required: true
-      entry_schema:
-        type: org.openecomp.datatypes.heat.neutron.port.FixedIps
-    port_1c1_t1_port_vlan_requirements:
+    compute_1c1_scalling_instance_name:
       type: list
       required: true
       entry_schema:
-        type: org.openecomp.datatypes.network.VlanRequirements
-    port_1c1_t2_port_ip_requirements:
-      type: list
+        type: string
+    port_1c1_scalling_instance_t2_port_0_network_role:
+      type: string
       required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.IpRequirements
-    port_1c1_t1_port_mac_requirements:
+    port_1c1_scalling_instance_t1_port_0_mac_requirements:
       type: org.openecomp.datatypes.network.MacRequirements
       required: true
+    port_1c1_scalling_instance_t1_port_0_subnetpoolid:
+      type: string
+      required: true
+    port_1c1_scalling_instance_t2_port_0_order:
+      type: integer
+      required: true
     index_value:
       type: integer
       description: Index value of this substitution service template runtime instance
@@ -98,82 +83,97 @@ topology_template:
       default: 0
       constraints:
       - greater_or_equal: 0
-    port_1c1_t2_port_network_role:
-      type: string
-      required: true
-    port_1c1_t2_port_order:
+    port_1c1_scalling_instance_t1_port_0_order:
       type: integer
       required: true
-    port_1c1_t2_port_mac_requirements:
-      type: org.openecomp.datatypes.network.MacRequirements
+    port_1c1_scalling_instance_t2_port_0_vlan_requirements:
+      type: list
       required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.VlanRequirements
+    port_1c1_scalling_instance_t1_port_0_name:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     compute_1c1_scalling_instance_availability_zone:
       type: list
       required: true
       entry_schema:
         type: string
-    port_1c1_t2_port_subnetpoolid:
-      type: string
+    port_1c1_scalling_instance_t2_port_0_ip_requirements:
+      type: list
       required: true
-    port_1c1_t2_port_name:
+      entry_schema:
+        type: org.openecomp.datatypes.network.IpRequirements
+    port_1c1_scalling_instance_t2_port_0_name:
       type: list
       required: true
       entry_schema:
         type: string
+    port_1c1_scalling_instance_t2_port_0_exCP_naming:
+      type: org.openecomp.datatypes.Naming
+      required: true
+    port_1c1_scalling_instance_t1_port_0_exCP_naming:
+      type: org.openecomp.datatypes.Naming
+      required: true
     compute_1c1_scalling_instance_scheduler_hints:
       type: list
       required: true
       entry_schema:
         type: json
-    port_1c1_t2_port_exCP_naming:
-      type: org.openecomp.datatypes.Naming
-      required: true
-    port_1c1_t1_port_subnetpoolid:
-      type: string
+    port_1c1_scalling_instance_t1_port_0_vlan_requirements:
+      type: list
       required: true
-    port_1c1_t1_port_network_role_tag:
+      entry_schema:
+        type: org.openecomp.datatypes.network.VlanRequirements
+    port_1c1_scalling_instance_t2_port_0_network_role_tag:
       type: string
       required: true
-    port_1c1_t1_port_network_role:
-      type: string
+    port_1c1_scalling_instance_t1_port_0_related_networks:
+      type: list
       required: true
-    port_1c1_t1_port_order:
-      type: integer
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+    port_1c1_scalling_instance_t2_port_0_network:
+      type: list
       required: true
+      entry_schema:
+        type: string
   node_templates:
-    1c1_scalling_instance_1c1_t1_port:
+    1c1_scalling_instance_1c1_scalling_instance_t2_port_0:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         mac_requirements:
-          get_input: port_1c1_t1_port_mac_requirements
+          get_input: port_1c1_scalling_instance_t2_port_0_mac_requirements
         order:
-          get_input: port_1c1_t1_port_order
+          get_input: port_1c1_scalling_instance_t2_port_0_order
         exCP_naming:
-          get_input: port_1c1_t1_port_exCP_naming
+          get_input: port_1c1_scalling_instance_t2_port_0_exCP_naming
         vlan_requirements:
-          get_input: port_1c1_t1_port_vlan_requirements
+          get_input: port_1c1_scalling_instance_t2_port_0_vlan_requirements
         subinterface_indicator: false
         ip_requirements:
-          get_input: port_1c1_t1_port_ip_requirements
+          get_input: port_1c1_scalling_instance_t2_port_0_ip_requirements
         related_networks:
-          get_input: port_1c1_t1_port_related_networks
+          get_input: port_1c1_scalling_instance_t2_port_0_related_networks
         network_role_tag:
-          get_input: port_1c1_t1_port_network_role_tag
+          get_input: port_1c1_scalling_instance_t2_port_0_network_role_tag
         network_role:
-          get_input: port_1c1_t1_port_network_role
+          get_input: port_1c1_scalling_instance_t2_port_0_network_role
         fixed_ips:
           get_input:
-          - port_1c1_t1_port_fixed_ips
+          - port_1c1_scalling_instance_t2_port_0_fixed_ips
           - index_value
         subnetpoolid:
-          get_input: port_1c1_t1_port_subnetpoolid
+          get_input: port_1c1_scalling_instance_t2_port_0_subnetpoolid
         name:
           get_input:
-          - port_1c1_t1_port_name
+          - port_1c1_scalling_instance_t2_port_0_name
           - index_value
         network:
           get_input:
-          - port_1c1_t1_port_network
+          - port_1c1_scalling_instance_t2_port_0_network
           - index_value
       requirements:
       - binding:
@@ -203,39 +203,39 @@ topology_template:
           get_input:
           - compute_1c1_scalling_instance_user_data_format
           - index_value
-    1c1_scalling_instance_1c1_t2_port:
+    1c1_scalling_instance_1c1_scalling_instance_t1_port_0:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         mac_requirements:
-          get_input: port_1c1_t2_port_mac_requirements
+          get_input: port_1c1_scalling_instance_t1_port_0_mac_requirements
         order:
-          get_input: port_1c1_t2_port_order
+          get_input: port_1c1_scalling_instance_t1_port_0_order
         exCP_naming:
-          get_input: port_1c1_t2_port_exCP_naming
+          get_input: port_1c1_scalling_instance_t1_port_0_exCP_naming
         vlan_requirements:
-          get_input: port_1c1_t2_port_vlan_requirements
+          get_input: port_1c1_scalling_instance_t1_port_0_vlan_requirements
         subinterface_indicator: false
         ip_requirements:
-          get_input: port_1c1_t2_port_ip_requirements
+          get_input: port_1c1_scalling_instance_t1_port_0_ip_requirements
         related_networks:
-          get_input: port_1c1_t2_port_related_networks
+          get_input: port_1c1_scalling_instance_t1_port_0_related_networks
         network_role_tag:
-          get_input: port_1c1_t2_port_network_role_tag
+          get_input: port_1c1_scalling_instance_t1_port_0_network_role_tag
         network_role:
-          get_input: port_1c1_t2_port_network_role
+          get_input: port_1c1_scalling_instance_t1_port_0_network_role
         fixed_ips:
           get_input:
-          - port_1c1_t2_port_fixed_ips
+          - port_1c1_scalling_instance_t1_port_0_fixed_ips
           - index_value
         subnetpoolid:
-          get_input: port_1c1_t2_port_subnetpoolid
+          get_input: port_1c1_scalling_instance_t1_port_0_subnetpoolid
         name:
           get_input:
-          - port_1c1_t2_port_name
+          - port_1c1_scalling_instance_t1_port_0_name
           - index_value
         network:
           get_input:
-          - port_1c1_t2_port_network
+          - port_1c1_scalling_instance_t1_port_0_network
           - index_value
       requirements:
       - binding:
@@ -249,11 +249,11 @@ topology_template:
         get_attribute:
         - 1c1_scalling_instance
         - instance_name
-    1c1_scalling_instance_1c1_t2_port_tenant_id:
+    1c1_scalling_instance_1c1_scalling_instance_t2_port_0_tenant_id:
       type: string
       value:
         get_attribute:
-        - 1c1_scalling_instance_1c1_t2_port
+        - 1c1_scalling_instance_1c1_scalling_instance_t2_port_0
         - tenant_id
   substitution_mappings:
     node_type: org.openecomp.resource.abstract.nodes.1c1_scalling_instance
@@ -273,114 +273,111 @@ topology_template:
       disk.read.bytes_1c1_scalling_instance:
       - 1c1_scalling_instance
       - disk.read.bytes
-      network.outgoing.packets.rate_1c1_scalling_instance_1c1_t2_port:
-      - 1c1_scalling_instance_1c1_t2_port
-      - network.outgoing.packets.rate
-      network.incoming.packets.rate_1c1_scalling_instance_1c1_t2_port:
-      - 1c1_scalling_instance_1c1_t2_port
-      - network.incoming.packets.rate
+      attachment_1c1_scalling_instance_1c1_scalling_instance_t2_port_0:
+      - 1c1_scalling_instance_1c1_scalling_instance_t2_port_0
+      - attachment
+      binding_1c1_scalling_instance_1c1_scalling_instance_t1_port_0:
+      - 1c1_scalling_instance_1c1_scalling_instance_t1_port_0
+      - binding
+      binding_1c1_scalling_instance_1c1_scalling_instance_t2_port_0:
+      - 1c1_scalling_instance_1c1_scalling_instance_t2_port_0
+      - binding
       disk.usage_1c1_scalling_instance:
       - 1c1_scalling_instance
       - disk.usage
+      forwarder_1c1_scalling_instance_1c1_scalling_instance_t2_port_0:
+      - 1c1_scalling_instance_1c1_scalling_instance_t2_port_0
+      - forwarder
       memory.resident_1c1_scalling_instance:
       - 1c1_scalling_instance
       - memory.resident
-      network.incoming.bytes.rate_1c1_scalling_instance_1c1_t2_port:
-      - 1c1_scalling_instance_1c1_t2_port
-      - network.incoming.bytes.rate
       cpu_1c1_scalling_instance:
       - 1c1_scalling_instance
       - cpu
-      forwarder_1c1_scalling_instance_1c1_t2_port:
-      - 1c1_scalling_instance_1c1_t2_port
+      forwarder_1c1_scalling_instance_1c1_scalling_instance_t1_port_0:
+      - 1c1_scalling_instance_1c1_scalling_instance_t1_port_0
       - forwarder
       disk.write.bytes_1c1_scalling_instance:
       - 1c1_scalling_instance
       - disk.write.bytes
-      network.incoming.packets.rate_1c1_scalling_instance_1c1_t1_port:
-      - 1c1_scalling_instance_1c1_t1_port
-      - network.incoming.packets.rate
-      network.incoming.bytes_1c1_scalling_instance_1c1_t1_port:
-      - 1c1_scalling_instance_1c1_t1_port
-      - network.incoming.bytes
       disk.write.bytes.rate_1c1_scalling_instance:
       - 1c1_scalling_instance
       - disk.write.bytes.rate
       disk.device.allocation_1c1_scalling_instance:
       - 1c1_scalling_instance
       - disk.device.allocation
-      network.incoming.bytes.rate_1c1_scalling_instance_1c1_t1_port:
-      - 1c1_scalling_instance_1c1_t1_port
-      - network.incoming.bytes.rate
+      network.outgoing.bytes.rate_1c1_scalling_instance_1c1_scalling_instance_t1_port_0:
+      - 1c1_scalling_instance_1c1_scalling_instance_t1_port_0
+      - network.outgoing.bytes.rate
       feature_1c1_scalling_instance:
       - 1c1_scalling_instance
       - feature
+      network.outgoing.bytes.rate_1c1_scalling_instance_1c1_scalling_instance_t2_port_0:
+      - 1c1_scalling_instance_1c1_scalling_instance_t2_port_0
+      - network.outgoing.bytes.rate
       disk.device.write.requests.rate_1c1_scalling_instance:
       - 1c1_scalling_instance
       - disk.device.write.requests.rate
-      forwarder_1c1_scalling_instance_1c1_t1_port:
-      - 1c1_scalling_instance_1c1_t1_port
-      - forwarder
       disk.read.bytes.rate_1c1_scalling_instance:
       - 1c1_scalling_instance
       - disk.read.bytes.rate
-      network.outpoing.packets_1c1_scalling_instance_1c1_t2_port:
-      - 1c1_scalling_instance_1c1_t2_port
-      - network.outpoing.packets
       scalable_1c1_scalling_instance:
       - 1c1_scalling_instance
       - scalable
       disk.device.read.bytes_1c1_scalling_instance:
       - 1c1_scalling_instance
       - disk.device.read.bytes
-      binding_1c1_scalling_instance_1c1_t2_port:
-      - 1c1_scalling_instance_1c1_t2_port
-      - binding
       disk.device.write.bytes_1c1_scalling_instance:
       - 1c1_scalling_instance
       - disk.device.write.bytes
       disk.read.requests_1c1_scalling_instance:
       - 1c1_scalling_instance
       - disk.read.requests
-      network.incoming.packets_1c1_scalling_instance_1c1_t2_port:
-      - 1c1_scalling_instance_1c1_t2_port
-      - network.incoming.packets
       vcpus_1c1_scalling_instance:
       - 1c1_scalling_instance
       - vcpus
-      network.outgoing.bytes_1c1_scalling_instance_1c1_t1_port:
-      - 1c1_scalling_instance_1c1_t1_port
-      - network.outgoing.bytes
+      network.incoming.packets_1c1_scalling_instance_1c1_scalling_instance_t2_port_0:
+      - 1c1_scalling_instance_1c1_scalling_instance_t2_port_0
+      - network.incoming.packets
       host_1c1_scalling_instance:
       - 1c1_scalling_instance
       - host
+      network.outgoing.packets.rate_1c1_scalling_instance_1c1_scalling_instance_t1_port_0:
+      - 1c1_scalling_instance_1c1_scalling_instance_t1_port_0
+      - network.outgoing.packets.rate
       disk.write.requests_1c1_scalling_instance:
       - 1c1_scalling_instance
       - disk.write.requests
-      feature_1c1_scalling_instance_1c1_t1_port:
-      - 1c1_scalling_instance_1c1_t1_port
+      network.incoming.packets.rate_1c1_scalling_instance_1c1_scalling_instance_t1_port_0:
+      - 1c1_scalling_instance_1c1_scalling_instance_t1_port_0
+      - network.incoming.packets.rate
+      feature_1c1_scalling_instance_1c1_scalling_instance_t1_port_0:
+      - 1c1_scalling_instance_1c1_scalling_instance_t1_port_0
       - feature
-      binding_1c1_scalling_instance_1c1_t1_port:
-      - 1c1_scalling_instance_1c1_t1_port
-      - binding
+      network.outpoing.packets_1c1_scalling_instance_1c1_scalling_instance_t2_port_0:
+      - 1c1_scalling_instance_1c1_scalling_instance_t2_port_0
+      - network.outpoing.packets
       disk.device.read.requests.rate_1c1_scalling_instance:
       - 1c1_scalling_instance
       - disk.device.read.requests.rate
-      attachment_1c1_scalling_instance_1c1_t2_port:
-      - 1c1_scalling_instance_1c1_t2_port
-      - attachment
       disk.device.read.bytes.rate_1c1_scalling_instance:
       - 1c1_scalling_instance
       - disk.device.read.bytes.rate
-      network.outgoing.packets.rate_1c1_scalling_instance_1c1_t1_port:
-      - 1c1_scalling_instance_1c1_t1_port
-      - network.outgoing.packets.rate
+      network.incoming.bytes.rate_1c1_scalling_instance_1c1_scalling_instance_t1_port_0:
+      - 1c1_scalling_instance_1c1_scalling_instance_t1_port_0
+      - network.incoming.bytes.rate
+      attachment_1c1_scalling_instance_1c1_scalling_instance_t1_port_0:
+      - 1c1_scalling_instance_1c1_scalling_instance_t1_port_0
+      - attachment
       disk.device.iops_1c1_scalling_instance:
       - 1c1_scalling_instance
       - disk.device.iops
       disk.device.capacity_1c1_scalling_instance:
       - 1c1_scalling_instance
       - disk.device.capacity
+      network.incoming.bytes_1c1_scalling_instance_1c1_scalling_instance_t2_port_0:
+      - 1c1_scalling_instance_1c1_scalling_instance_t2_port_0
+      - network.incoming.bytes
       disk.capacity_1c1_scalling_instance:
       - 1c1_scalling_instance
       - disk.capacity
@@ -390,21 +387,24 @@ topology_template:
       cpu_util_1c1_scalling_instance:
       - 1c1_scalling_instance
       - cpu_util
+      network.outgoing.bytes_1c1_scalling_instance_1c1_scalling_instance_t2_port_0:
+      - 1c1_scalling_instance_1c1_scalling_instance_t2_port_0
+      - network.outgoing.bytes
       disk.device.read.requests_1c1_scalling_instance:
       - 1c1_scalling_instance
       - disk.device.read.requests
       disk.device.write.bytes.rate_1c1_scalling_instance:
       - 1c1_scalling_instance
       - disk.device.write.bytes.rate
+      network.outgoing.bytes_1c1_scalling_instance_1c1_scalling_instance_t1_port_0:
+      - 1c1_scalling_instance_1c1_scalling_instance_t1_port_0
+      - network.outgoing.bytes
+      network.incoming.packets_1c1_scalling_instance_1c1_scalling_instance_t1_port_0:
+      - 1c1_scalling_instance_1c1_scalling_instance_t1_port_0
+      - network.incoming.packets
       disk.device.write.requests_1c1_scalling_instance:
       - 1c1_scalling_instance
       - disk.device.write.requests
-      network.outgoing.bytes.rate_1c1_scalling_instance_1c1_t1_port:
-      - 1c1_scalling_instance_1c1_t1_port
-      - network.outgoing.bytes.rate
-      network.outgoing.bytes_1c1_scalling_instance_1c1_t2_port:
-      - 1c1_scalling_instance_1c1_t2_port
-      - network.outgoing.bytes
       disk.latency_1c1_scalling_instance:
       - 1c1_scalling_instance
       - disk.latency
@@ -414,42 +414,42 @@ topology_template:
       disk.device.usage_1c1_scalling_instance:
       - 1c1_scalling_instance
       - disk.device.usage
-      network.incoming.packets_1c1_scalling_instance_1c1_t1_port:
-      - 1c1_scalling_instance_1c1_t1_port
-      - network.incoming.packets
       disk.allocation_1c1_scalling_instance:
       - 1c1_scalling_instance
       - disk.allocation
-      feature_1c1_scalling_instance_1c1_t2_port:
-      - 1c1_scalling_instance_1c1_t2_port
-      - feature
       memory.usage_1c1_scalling_instance:
       - 1c1_scalling_instance
       - memory.usage
-      network.incoming.bytes_1c1_scalling_instance_1c1_t2_port:
-      - 1c1_scalling_instance_1c1_t2_port
-      - network.incoming.bytes
-      network.outgoing.bytes.rate_1c1_scalling_instance_1c1_t2_port:
-      - 1c1_scalling_instance_1c1_t2_port
-      - network.outgoing.bytes.rate
       os_1c1_scalling_instance:
       - 1c1_scalling_instance
       - os
       disk.iops_1c1_scalling_instance:
       - 1c1_scalling_instance
       - disk.iops
-      network.outpoing.packets_1c1_scalling_instance_1c1_t1_port:
-      - 1c1_scalling_instance_1c1_t1_port
+      network.outgoing.packets.rate_1c1_scalling_instance_1c1_scalling_instance_t2_port_0:
+      - 1c1_scalling_instance_1c1_scalling_instance_t2_port_0
+      - network.outgoing.packets.rate
+      network.outpoing.packets_1c1_scalling_instance_1c1_scalling_instance_t1_port_0:
+      - 1c1_scalling_instance_1c1_scalling_instance_t1_port_0
       - network.outpoing.packets
-      attachment_1c1_scalling_instance_1c1_t1_port:
-      - 1c1_scalling_instance_1c1_t1_port
-      - attachment
       cpu.delta_1c1_scalling_instance:
       - 1c1_scalling_instance
       - cpu.delta
       memory_1c1_scalling_instance:
       - 1c1_scalling_instance
       - memory
+      feature_1c1_scalling_instance_1c1_scalling_instance_t2_port_0:
+      - 1c1_scalling_instance_1c1_scalling_instance_t2_port_0
+      - feature
+      network.incoming.bytes.rate_1c1_scalling_instance_1c1_scalling_instance_t2_port_0:
+      - 1c1_scalling_instance_1c1_scalling_instance_t2_port_0
+      - network.incoming.bytes.rate
+      network.incoming.bytes_1c1_scalling_instance_1c1_scalling_instance_t1_port_0:
+      - 1c1_scalling_instance_1c1_scalling_instance_t1_port_0
+      - network.incoming.bytes
+      network.incoming.packets.rate_1c1_scalling_instance_1c1_scalling_instance_t2_port_0:
+      - 1c1_scalling_instance_1c1_scalling_instance_t2_port_0
+      - network.incoming.packets.rate
       instance_1c1_scalling_instance:
       - 1c1_scalling_instance
       - instance
@@ -457,17 +457,17 @@ topology_template:
       dependency_1c1_scalling_instance:
       - 1c1_scalling_instance
       - dependency
-      link_1c1_scalling_instance_1c1_t1_port:
-      - 1c1_scalling_instance_1c1_t1_port
-      - link
-      dependency_1c1_scalling_instance_1c1_t2_port:
-      - 1c1_scalling_instance_1c1_t2_port
+      dependency_1c1_scalling_instance_1c1_scalling_instance_t1_port_0:
+      - 1c1_scalling_instance_1c1_scalling_instance_t1_port_0
       - dependency
-      dependency_1c1_scalling_instance_1c1_t1_port:
-      - 1c1_scalling_instance_1c1_t1_port
+      dependency_1c1_scalling_instance_1c1_scalling_instance_t2_port_0:
+      - 1c1_scalling_instance_1c1_scalling_instance_t2_port_0
       - dependency
-      link_1c1_scalling_instance_1c1_t2_port:
-      - 1c1_scalling_instance_1c1_t2_port
+      link_1c1_scalling_instance_1c1_scalling_instance_t2_port_0:
+      - 1c1_scalling_instance_1c1_scalling_instance_t2_port_0
+      - link
+      link_1c1_scalling_instance_1c1_scalling_instance_t1_port_0:
+      - 1c1_scalling_instance_1c1_scalling_instance_t1_port_0
       - link
       local_storage_1c1_scalling_instance:
       - 1c1_scalling_instance
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c2_catalog_instanceServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c2_catalog_instanceServiceTemplate.yaml
index ff4f00e722..07e9605032 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c2_catalog_instanceServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c2_catalog_instanceServiceTemplate.yaml
@@ -11,69 +11,63 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
-    port_1c2_t2_port_order:
-      type: integer
-      required: true
-    compute_1c2_catalog_instance_availability_zone:
+    port_1c2_catalog_instance_t1_port_0_network:
       type: list
       required: true
       entry_schema:
         type: string
-    port_1c2_t2_port_subnetpoolid:
-      type: string
+    port_1c2_catalog_instance_t2_port_0_vlan_requirements:
+      type: list
       required: true
-    port_1c2_t1_port_related_networks:
+      entry_schema:
+        type: org.openecomp.datatypes.network.VlanRequirements
+    compute_1c2_catalog_instance_availability_zone:
       type: list
       required: true
       entry_schema:
-        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
-    port_1c2_t2_port_network_role:
-      type: string
+        type: string
+    port_1c2_catalog_instance_t1_port_0_ip_requirements:
+      type: list
       required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.IpRequirements
     vm_flavor_name:
       type: string
       required: true
-    port_1c2_t2_port_network_role_tag:
+    port_1c2_catalog_instance_t2_port_0_network_role_tag:
       type: string
       required: true
-    port_1c2_t1_port_vlan_requirements:
+    port_1c2_catalog_instance_t2_port_0_network:
       type: list
       required: true
       entry_schema:
-        type: org.openecomp.datatypes.network.VlanRequirements
+        type: string
     vm_image_name:
       type: string
       required: true
-    port_1c2_t2_port_exCP_naming:
-      type: org.openecomp.datatypes.Naming
+    port_1c2_catalog_instance_t1_port_0_mac_requirements:
+      type: org.openecomp.datatypes.network.MacRequirements
       required: true
-    port_1c2_t1_port_order:
-      type: integer
+    port_1c2_catalog_instance_t2_port_0_network_role:
+      type: string
       required: true
-    port_1c2_t1_port_subnetpoolid:
+    port_1c2_catalog_instance_t1_port_0_subnetpoolid:
       type: string
       required: true
-    port_1c2_t2_port_ip_requirements:
-      type: list
+    port_1c2_catalog_instance_t2_port_0_order:
+      type: integer
       required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.IpRequirements
-    port_1c2_t2_port_related_networks:
+    port_1c2_catalog_instance_t2_port_0_related_networks:
       type: list
       required: true
       entry_schema:
         type: org.openecomp.datatypes.network.RelatedNetworksAssignments
-    port_1c2_t1_port_mac_requirements:
-      type: org.openecomp.datatypes.network.MacRequirements
-      required: true
-    port_1c2_t1_port_network_role:
-      type: string
+    port_1c2_catalog_instance_t1_port_0_order:
+      type: integer
       required: true
-    port_1c2_t2_port_network:
-      type: list
+    port_1c2_catalog_instance_t2_port_0_mac_requirements:
+      type: org.openecomp.datatypes.network.MacRequirements
       required: true
-      entry_schema:
-        type: string
     index_value:
       type: integer
       description: Index value of this substitution service template runtime instance
@@ -86,35 +80,41 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    port_1c2_t1_port_exCP_naming:
-      type: org.openecomp.datatypes.Naming
-      required: true
-    port_1c2_t1_port_network:
+    port_1c2_catalog_instance_t2_port_0_ip_requirements:
       type: list
       required: true
       entry_schema:
-        type: string
-    port_1c2_t2_port_mac_requirements:
-      type: org.openecomp.datatypes.network.MacRequirements
-      required: true
-    port_1c2_t2_port_vlan_requirements:
+        type: org.openecomp.datatypes.network.IpRequirements
+    port_1c2_catalog_instance_t1_port_0_related_networks:
       type: list
       required: true
       entry_schema:
-        type: org.openecomp.datatypes.network.VlanRequirements
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+    port_1c2_catalog_instance_t2_port_0_subnetpoolid:
+      type: string
+      required: true
+    port_1c2_catalog_instance_t1_port_0_network_role:
+      type: string
+      required: true
+    port_1c2_catalog_instance_t1_port_0_exCP_naming:
+      type: org.openecomp.datatypes.Naming
+      required: true
     compute_1c2_catalog_instance_user_data_format:
       type: list
       required: true
       entry_schema:
         type: string
-    port_1c2_t1_port_network_role_tag:
-      type: string
-      required: true
-    port_1c2_t1_port_ip_requirements:
+    port_1c2_catalog_instance_t1_port_0_vlan_requirements:
       type: list
       required: true
       entry_schema:
-        type: org.openecomp.datatypes.network.IpRequirements
+        type: org.openecomp.datatypes.network.VlanRequirements
+    port_1c2_catalog_instance_t2_port_0_exCP_naming:
+      type: org.openecomp.datatypes.Naming
+      required: true
+    port_1c2_catalog_instance_t1_port_0_network_role_tag:
+      type: string
+      required: true
     compute_1c2_catalog_instance_scheduler_hints:
       type: list
       required: true
@@ -144,62 +144,62 @@ topology_template:
           get_input:
           - compute_1c2_catalog_instance_user_data_format
           - index_value
-    1c2_catalog_instance_1c2_t2_port:
+    1c2_catalog_instance_1c2_catalog_instance_t1_port_0:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         exCP_naming:
-          get_input: port_1c2_t2_port_exCP_naming
+          get_input: port_1c2_catalog_instance_t1_port_0_exCP_naming
         vlan_requirements:
-          get_input: port_1c2_t2_port_vlan_requirements
+          get_input: port_1c2_catalog_instance_t1_port_0_vlan_requirements
         subinterface_indicator: false
         related_networks:
-          get_input: port_1c2_t2_port_related_networks
+          get_input: port_1c2_catalog_instance_t1_port_0_related_networks
         ip_requirements:
-          get_input: port_1c2_t2_port_ip_requirements
+          get_input: port_1c2_catalog_instance_t1_port_0_ip_requirements
         network_role_tag:
-          get_input: port_1c2_t2_port_network_role_tag
+          get_input: port_1c2_catalog_instance_t1_port_0_network_role_tag
         mac_requirements:
-          get_input: port_1c2_t2_port_mac_requirements
+          get_input: port_1c2_catalog_instance_t1_port_0_mac_requirements
         order:
-          get_input: port_1c2_t2_port_order
+          get_input: port_1c2_catalog_instance_t1_port_0_order
         network_role:
-          get_input: port_1c2_t2_port_network_role
+          get_input: port_1c2_catalog_instance_t1_port_0_network_role
         subnetpoolid:
-          get_input: port_1c2_t2_port_subnetpoolid
+          get_input: port_1c2_catalog_instance_t1_port_0_subnetpoolid
         network:
           get_input:
-          - port_1c2_t2_port_network
+          - port_1c2_catalog_instance_t1_port_0_network
           - index_value
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
           node: 1c2_catalog_instance
           relationship: tosca.relationships.network.BindsTo
-    1c2_catalog_instance_1c2_t1_port:
+    1c2_catalog_instance_1c2_catalog_instance_t2_port_0:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         exCP_naming:
-          get_input: port_1c2_t1_port_exCP_naming
+          get_input: port_1c2_catalog_instance_t2_port_0_exCP_naming
         vlan_requirements:
-          get_input: port_1c2_t1_port_vlan_requirements
+          get_input: port_1c2_catalog_instance_t2_port_0_vlan_requirements
         subinterface_indicator: false
         related_networks:
-          get_input: port_1c2_t1_port_related_networks
+          get_input: port_1c2_catalog_instance_t2_port_0_related_networks
         ip_requirements:
-          get_input: port_1c2_t1_port_ip_requirements
+          get_input: port_1c2_catalog_instance_t2_port_0_ip_requirements
         network_role_tag:
-          get_input: port_1c2_t1_port_network_role_tag
+          get_input: port_1c2_catalog_instance_t2_port_0_network_role_tag
         mac_requirements:
-          get_input: port_1c2_t1_port_mac_requirements
+          get_input: port_1c2_catalog_instance_t2_port_0_mac_requirements
         order:
-          get_input: port_1c2_t1_port_order
+          get_input: port_1c2_catalog_instance_t2_port_0_order
         network_role:
-          get_input: port_1c2_t1_port_network_role
+          get_input: port_1c2_catalog_instance_t2_port_0_network_role
         subnetpoolid:
-          get_input: port_1c2_t1_port_subnetpoolid
+          get_input: port_1c2_catalog_instance_t2_port_0_subnetpoolid
         network:
           get_input:
-          - port_1c2_t1_port_network
+          - port_1c2_catalog_instance_t2_port_0_network
           - index_value
       requirements:
       - binding:
@@ -213,11 +213,11 @@ topology_template:
         get_attribute:
         - 1c2_catalog_instance
         - instance_name
-    1c2_catalog_instance_1c2_t1_port_tenant_id:
+    1c2_catalog_instance_1c2_catalog_instance_t1_port_0_tenant_id:
       type: string
       value:
         get_attribute:
-        - 1c2_catalog_instance_1c2_t1_port
+        - 1c2_catalog_instance_1c2_catalog_instance_t1_port_0
         - tenant_id
   substitution_mappings:
     node_type: org.openecomp.resource.abstract.nodes.1c2_catalog_instance
@@ -225,57 +225,33 @@ topology_template:
       disk.device.capacity_1c2_catalog_instance:
       - 1c2_catalog_instance
       - disk.device.capacity
-      network.incoming.packets.rate_1c2_catalog_instance_1c2_t2_port:
-      - 1c2_catalog_instance_1c2_t2_port
-      - network.incoming.packets.rate
       disk.read.bytes.rate_1c2_catalog_instance:
       - 1c2_catalog_instance
       - disk.read.bytes.rate
       memory.usage_1c2_catalog_instance:
       - 1c2_catalog_instance
       - memory.usage
-      network.outpoing.packets_1c2_catalog_instance_1c2_t1_port:
-      - 1c2_catalog_instance_1c2_t1_port
-      - network.outpoing.packets
+      attachment_1c2_catalog_instance_1c2_catalog_instance_t1_port_0:
+      - 1c2_catalog_instance_1c2_catalog_instance_t1_port_0
+      - attachment
       disk.write.bytes.rate_1c2_catalog_instance:
       - 1c2_catalog_instance
       - disk.write.bytes.rate
-      network.incoming.bytes.rate_1c2_catalog_instance_1c2_t2_port:
-      - 1c2_catalog_instance_1c2_t2_port
-      - network.incoming.bytes.rate
-      binding_1c2_catalog_instance_1c2_t2_port:
-      - 1c2_catalog_instance_1c2_t2_port
-      - binding
-      network.incoming.packets_1c2_catalog_instance_1c2_t1_port:
-      - 1c2_catalog_instance_1c2_t1_port
-      - network.incoming.packets
       cpu_util_1c2_catalog_instance:
       - 1c2_catalog_instance
       - cpu_util
-      network.outpoing.packets_1c2_catalog_instance_1c2_t2_port:
-      - 1c2_catalog_instance_1c2_t2_port
-      - network.outpoing.packets
-      feature_1c2_catalog_instance_1c2_t1_port:
-      - 1c2_catalog_instance_1c2_t1_port
-      - feature
-      attachment_1c2_catalog_instance_1c2_t1_port:
-      - 1c2_catalog_instance_1c2_t1_port
-      - attachment
-      network.incoming.bytes_1c2_catalog_instance_1c2_t2_port:
-      - 1c2_catalog_instance_1c2_t2_port
-      - network.incoming.bytes
+      network.incoming.bytes.rate_1c2_catalog_instance_1c2_catalog_instance_t2_port_0:
+      - 1c2_catalog_instance_1c2_catalog_instance_t2_port_0
+      - network.incoming.bytes.rate
       cpu_1c2_catalog_instance:
       - 1c2_catalog_instance
       - cpu
       disk.read.requests_1c2_catalog_instance:
       - 1c2_catalog_instance
       - disk.read.requests
-      network.incoming.bytes.rate_1c2_catalog_instance_1c2_t1_port:
-      - 1c2_catalog_instance_1c2_t1_port
-      - network.incoming.bytes.rate
-      binding_1c2_catalog_instance_1c2_t1_port:
-      - 1c2_catalog_instance_1c2_t1_port
-      - binding
+      network.outpoing.packets_1c2_catalog_instance_1c2_catalog_instance_t2_port_0:
+      - 1c2_catalog_instance_1c2_catalog_instance_t2_port_0
+      - network.outpoing.packets
       disk.ephemeral.size_1c2_catalog_instance:
       - 1c2_catalog_instance
       - disk.ephemeral.size
@@ -285,63 +261,75 @@ topology_template:
       memory.resident_1c2_catalog_instance:
       - 1c2_catalog_instance
       - memory.resident
+      network.outpoing.packets_1c2_catalog_instance_1c2_catalog_instance_t1_port_0:
+      - 1c2_catalog_instance_1c2_catalog_instance_t1_port_0
+      - network.outpoing.packets
       disk.device.write.requests.rate_1c2_catalog_instance:
       - 1c2_catalog_instance
       - disk.device.write.requests.rate
-      network.incoming.bytes_1c2_catalog_instance_1c2_t1_port:
-      - 1c2_catalog_instance_1c2_t1_port
-      - network.incoming.bytes
       os_1c2_catalog_instance:
       - 1c2_catalog_instance
       - os
       disk.device.iops_1c2_catalog_instance:
       - 1c2_catalog_instance
       - disk.device.iops
+      binding_1c2_catalog_instance_1c2_catalog_instance_t1_port_0:
+      - 1c2_catalog_instance_1c2_catalog_instance_t1_port_0
+      - binding
+      feature_1c2_catalog_instance_1c2_catalog_instance_t1_port_0:
+      - 1c2_catalog_instance_1c2_catalog_instance_t1_port_0
+      - feature
+      network.outgoing.bytes_1c2_catalog_instance_1c2_catalog_instance_t1_port_0:
+      - 1c2_catalog_instance_1c2_catalog_instance_t1_port_0
+      - network.outgoing.bytes
+      network.outgoing.bytes.rate_1c2_catalog_instance_1c2_catalog_instance_t1_port_0:
+      - 1c2_catalog_instance_1c2_catalog_instance_t1_port_0
+      - network.outgoing.bytes.rate
+      network.outgoing.packets.rate_1c2_catalog_instance_1c2_catalog_instance_t1_port_0:
+      - 1c2_catalog_instance_1c2_catalog_instance_t1_port_0
+      - network.outgoing.packets.rate
+      network.incoming.packets_1c2_catalog_instance_1c2_catalog_instance_t1_port_0:
+      - 1c2_catalog_instance_1c2_catalog_instance_t1_port_0
+      - network.incoming.packets
       endpoint_1c2_catalog_instance:
       - 1c2_catalog_instance
       - endpoint
       disk.allocation_1c2_catalog_instance:
       - 1c2_catalog_instance
       - disk.allocation
+      network.incoming.bytes.rate_1c2_catalog_instance_1c2_catalog_instance_t1_port_0:
+      - 1c2_catalog_instance_1c2_catalog_instance_t1_port_0
+      - network.incoming.bytes.rate
       disk.latency_1c2_catalog_instance:
       - 1c2_catalog_instance
       - disk.latency
-      network.outgoing.bytes.rate_1c2_catalog_instance_1c2_t1_port:
-      - 1c2_catalog_instance_1c2_t1_port
-      - network.outgoing.bytes.rate
-      network.outgoing.bytes_1c2_catalog_instance_1c2_t1_port:
-      - 1c2_catalog_instance_1c2_t1_port
-      - network.outgoing.bytes
+      network.incoming.bytes_1c2_catalog_instance_1c2_catalog_instance_t1_port_0:
+      - 1c2_catalog_instance_1c2_catalog_instance_t1_port_0
+      - network.incoming.bytes
       disk.iops_1c2_catalog_instance:
       - 1c2_catalog_instance
       - disk.iops
-      network.outgoing.packets.rate_1c2_catalog_instance_1c2_t2_port:
-      - 1c2_catalog_instance_1c2_t2_port
-      - network.outgoing.packets.rate
-      network.incoming.packets_1c2_catalog_instance_1c2_t2_port:
-      - 1c2_catalog_instance_1c2_t2_port
-      - network.incoming.packets
+      forwarder_1c2_catalog_instance_1c2_catalog_instance_t1_port_0:
+      - 1c2_catalog_instance_1c2_catalog_instance_t1_port_0
+      - forwarder
+      attachment_1c2_catalog_instance_1c2_catalog_instance_t2_port_0:
+      - 1c2_catalog_instance_1c2_catalog_instance_t2_port_0
+      - attachment
       vcpus_1c2_catalog_instance:
       - 1c2_catalog_instance
       - vcpus
       disk.device.latency_1c2_catalog_instance:
       - 1c2_catalog_instance
       - disk.device.latency
-      attachment_1c2_catalog_instance_1c2_t2_port:
-      - 1c2_catalog_instance_1c2_t2_port
-      - attachment
-      forwarder_1c2_catalog_instance_1c2_t1_port:
-      - 1c2_catalog_instance_1c2_t1_port
-      - forwarder
-      network.outgoing.packets.rate_1c2_catalog_instance_1c2_t1_port:
-      - 1c2_catalog_instance_1c2_t1_port
-      - network.outgoing.packets.rate
       disk.read.bytes_1c2_catalog_instance:
       - 1c2_catalog_instance
       - disk.read.bytes
       instance_1c2_catalog_instance:
       - 1c2_catalog_instance
       - instance
+      network.incoming.packets.rate_1c2_catalog_instance_1c2_catalog_instance_t2_port_0:
+      - 1c2_catalog_instance_1c2_catalog_instance_t2_port_0
+      - network.incoming.packets.rate
       disk.capacity_1c2_catalog_instance:
       - 1c2_catalog_instance
       - disk.capacity
@@ -351,18 +339,12 @@ topology_template:
       disk.device.read.bytes.rate_1c2_catalog_instance:
       - 1c2_catalog_instance
       - disk.device.read.bytes.rate
-      forwarder_1c2_catalog_instance_1c2_t2_port:
-      - 1c2_catalog_instance_1c2_t2_port
-      - forwarder
       disk.device.allocation_1c2_catalog_instance:
       - 1c2_catalog_instance
       - disk.device.allocation
       disk.device.read.bytes_1c2_catalog_instance:
       - 1c2_catalog_instance
       - disk.device.read.bytes
-      network.outgoing.bytes.rate_1c2_catalog_instance_1c2_t2_port:
-      - 1c2_catalog_instance_1c2_t2_port
-      - network.outgoing.bytes.rate
       disk.device.read.requests_1c2_catalog_instance:
       - 1c2_catalog_instance
       - disk.device.read.requests
@@ -384,18 +366,30 @@ topology_template:
       disk.device.usage_1c2_catalog_instance:
       - 1c2_catalog_instance
       - disk.device.usage
-      network.outgoing.bytes_1c2_catalog_instance_1c2_t2_port:
-      - 1c2_catalog_instance_1c2_t2_port
+      binding_1c2_catalog_instance_1c2_catalog_instance_t2_port_0:
+      - 1c2_catalog_instance_1c2_catalog_instance_t2_port_0
+      - binding
+      network.incoming.packets_1c2_catalog_instance_1c2_catalog_instance_t2_port_0:
+      - 1c2_catalog_instance_1c2_catalog_instance_t2_port_0
+      - network.incoming.packets
+      feature_1c2_catalog_instance_1c2_catalog_instance_t2_port_0:
+      - 1c2_catalog_instance_1c2_catalog_instance_t2_port_0
+      - feature
+      network.outgoing.bytes_1c2_catalog_instance_1c2_catalog_instance_t2_port_0:
+      - 1c2_catalog_instance_1c2_catalog_instance_t2_port_0
       - network.outgoing.bytes
+      network.outgoing.bytes.rate_1c2_catalog_instance_1c2_catalog_instance_t2_port_0:
+      - 1c2_catalog_instance_1c2_catalog_instance_t2_port_0
+      - network.outgoing.bytes.rate
       disk.usage_1c2_catalog_instance:
       - 1c2_catalog_instance
       - disk.usage
+      network.outgoing.packets.rate_1c2_catalog_instance_1c2_catalog_instance_t2_port_0:
+      - 1c2_catalog_instance_1c2_catalog_instance_t2_port_0
+      - network.outgoing.packets.rate
       feature_1c2_catalog_instance:
       - 1c2_catalog_instance
       - feature
-      network.incoming.packets.rate_1c2_catalog_instance_1c2_t1_port:
-      - 1c2_catalog_instance_1c2_t1_port
-      - network.incoming.packets.rate
       memory_1c2_catalog_instance:
       - 1c2_catalog_instance
       - memory
@@ -411,28 +405,34 @@ topology_template:
       cpu.delta_1c2_catalog_instance:
       - 1c2_catalog_instance
       - cpu.delta
-      feature_1c2_catalog_instance_1c2_t2_port:
-      - 1c2_catalog_instance_1c2_t2_port
-      - feature
+      forwarder_1c2_catalog_instance_1c2_catalog_instance_t2_port_0:
+      - 1c2_catalog_instance_1c2_catalog_instance_t2_port_0
+      - forwarder
+      network.incoming.packets.rate_1c2_catalog_instance_1c2_catalog_instance_t1_port_0:
+      - 1c2_catalog_instance_1c2_catalog_instance_t1_port_0
+      - network.incoming.packets.rate
+      network.incoming.bytes_1c2_catalog_instance_1c2_catalog_instance_t2_port_0:
+      - 1c2_catalog_instance_1c2_catalog_instance_t2_port_0
+      - network.incoming.bytes
       disk.device.read.requests.rate_1c2_catalog_instance:
       - 1c2_catalog_instance
       - disk.device.read.requests.rate
     requirements:
-      link_1c2_catalog_instance_1c2_t1_port:
-      - 1c2_catalog_instance_1c2_t1_port
-      - link
       dependency_1c2_catalog_instance:
       - 1c2_catalog_instance
       - dependency
       local_storage_1c2_catalog_instance:
       - 1c2_catalog_instance
       - local_storage
-      dependency_1c2_catalog_instance_1c2_t1_port:
-      - 1c2_catalog_instance_1c2_t1_port
+      dependency_1c2_catalog_instance_1c2_catalog_instance_t2_port_0:
+      - 1c2_catalog_instance_1c2_catalog_instance_t2_port_0
       - dependency
-      dependency_1c2_catalog_instance_1c2_t2_port:
-      - 1c2_catalog_instance_1c2_t2_port
+      link_1c2_catalog_instance_1c2_catalog_instance_t2_port_0:
+      - 1c2_catalog_instance_1c2_catalog_instance_t2_port_0
+      - link
+      dependency_1c2_catalog_instance_1c2_catalog_instance_t1_port_0:
+      - 1c2_catalog_instance_1c2_catalog_instance_t1_port_0
       - dependency
-      link_1c2_catalog_instance_1c2_t2_port:
-      - 1c2_catalog_instance_1c2_t2_port
+      link_1c2_catalog_instance_1c2_catalog_instance_t1_port_0:
+      - 1c2_catalog_instance_1c2_catalog_instance_t1_port_0
       - link
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_a_single_1aServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_a_single_1aServiceTemplate.yaml
index 37ef56746b..d100be8424 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_a_single_1aServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_a_single_1aServiceTemplate.yaml
@@ -11,57 +11,61 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
-    port_1a_t1_port_ip_requirements:
+    port_a_single_1a_t1_port_0_vlan_requirements:
       type: list
       required: true
       entry_schema:
-        type: org.openecomp.datatypes.network.IpRequirements
-    port_1a_t2_port_network_role_tag:
-      type: string
+        type: org.openecomp.datatypes.network.VlanRequirements
+    port_a_single_1a_t1_port_0_order:
+      type: integer
       required: true
+    port_a_single_1a_t2_port_0_order:
+      type: integer
+      required: true
+    port_a_single_1a_t2_port_0_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.VlanRequirements
     vm_flavor_name:
       type: string
       required: true
-    port_1a_t2_port_network_role:
+    port_a_single_1a_t2_port_0_network_role_tag:
       type: string
       required: true
-    port_1a_t2_port_network:
-      type: list
-      required: true
-      entry_schema:
-        type: string
-    port_1a_t1_port_mac_requirements:
+    port_a_single_1a_t1_port_0_mac_requirements:
       type: org.openecomp.datatypes.network.MacRequirements
       required: true
-    port_1a_t1_port_network:
-      type: list
-      required: true
-      entry_schema:
-        type: string
-    port_1a_t1_port_subnetpoolid:
+    port_a_single_1a_t1_port_0_subnetpoolid:
       type: string
       required: true
     vm_image_name:
       type: string
       required: true
-    port_1a_t2_port_related_networks:
+    port_a_single_1a_t2_port_0_network:
       type: list
       required: true
       entry_schema:
-        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
-    port_1a_t2_port_ip_requirements:
+        type: string
+    port_a_single_1a_t1_port_0_network_role_tag:
+      type: string
+      required: true
+    port_a_single_1a_t1_port_0_ip_requirements:
       type: list
       required: true
       entry_schema:
         type: org.openecomp.datatypes.network.IpRequirements
-    port_1a_t1_port_vlan_requirements:
+    port_a_single_1a_t2_port_0_subnetpoolid:
+      type: string
+      required: true
+    port_a_single_1a_t2_port_0_mac_requirements:
+      type: org.openecomp.datatypes.network.MacRequirements
+      required: true
+    port_a_single_1a_t1_port_0_network:
       type: list
       required: true
       entry_schema:
-        type: org.openecomp.datatypes.network.VlanRequirements
-    port_1a_t1_port_exCP_naming:
-      type: org.openecomp.datatypes.Naming
-      required: true
+        type: string
     compute_a_single_1a_availability_zone:
       type: list
       required: true
@@ -79,34 +83,30 @@ topology_template:
       default: 0
       constraints:
       - greater_or_equal: 0
-    port_1a_t1_port_related_networks:
+    port_a_single_1a_t1_port_0_network_role:
+      type: string
+      required: true
+    port_a_single_1a_t1_port_0_related_networks:
       type: list
       required: true
       entry_schema:
         type: org.openecomp.datatypes.network.RelatedNetworksAssignments
-    port_1a_t1_port_network_role_tag:
-      type: string
-      required: true
-    port_1a_t1_port_network_role:
-      type: string
-      required: true
-    port_1a_t1_port_order:
-      type: integer
+    port_a_single_1a_t1_port_0_exCP_naming:
+      type: org.openecomp.datatypes.Naming
       required: true
-    port_1a_t2_port_exCP_naming:
+    port_a_single_1a_t2_port_0_exCP_naming:
       type: org.openecomp.datatypes.Naming
       required: true
-    port_1a_t2_port_vlan_requirements:
+    port_a_single_1a_t2_port_0_ip_requirements:
       type: list
       required: true
       entry_schema:
-        type: org.openecomp.datatypes.network.VlanRequirements
-    port_1a_t2_port_subnetpoolid:
-      type: string
-      required: true
-    port_1a_t2_port_order:
-      type: integer
+        type: org.openecomp.datatypes.network.IpRequirements
+    port_a_single_1a_t2_port_0_related_networks:
+      type: list
       required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     compute_a_single_1a_user_data_format:
       type: list
       required: true
@@ -117,35 +117,35 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    port_1a_t2_port_mac_requirements:
-      type: org.openecomp.datatypes.network.MacRequirements
+    port_a_single_1a_t2_port_0_network_role:
+      type: string
       required: true
   node_templates:
-    a_single_1a_1a_t1_port:
+    a_single_1a_a_single_1a_t2_port_0:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         exCP_naming:
-          get_input: port_1a_t1_port_exCP_naming
+          get_input: port_a_single_1a_t2_port_0_exCP_naming
         vlan_requirements:
-          get_input: port_1a_t1_port_vlan_requirements
+          get_input: port_a_single_1a_t2_port_0_vlan_requirements
         subinterface_indicator: false
         related_networks:
-          get_input: port_1a_t1_port_related_networks
+          get_input: port_a_single_1a_t2_port_0_related_networks
         ip_requirements:
-          get_input: port_1a_t1_port_ip_requirements
+          get_input: port_a_single_1a_t2_port_0_ip_requirements
         network_role_tag:
-          get_input: port_1a_t1_port_network_role_tag
+          get_input: port_a_single_1a_t2_port_0_network_role_tag
         mac_requirements:
-          get_input: port_1a_t1_port_mac_requirements
+          get_input: port_a_single_1a_t2_port_0_mac_requirements
         order:
-          get_input: port_1a_t1_port_order
+          get_input: port_a_single_1a_t2_port_0_order
         network_role:
-          get_input: port_1a_t1_port_network_role
+          get_input: port_a_single_1a_t2_port_0_network_role
         subnetpoolid:
-          get_input: port_1a_t1_port_subnetpoolid
+          get_input: port_a_single_1a_t2_port_0_subnetpoolid
         network:
           get_input:
-          - port_1a_t1_port_network
+          - port_a_single_1a_t2_port_0_network
           - index_value
       requirements:
       - binding:
@@ -175,31 +175,31 @@ topology_template:
           get_input:
           - compute_a_single_1a_user_data_format
           - index_value
-    a_single_1a_1a_t2_port:
+    a_single_1a_a_single_1a_t1_port_0:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         exCP_naming:
-          get_input: port_1a_t2_port_exCP_naming
+          get_input: port_a_single_1a_t1_port_0_exCP_naming
         vlan_requirements:
-          get_input: port_1a_t2_port_vlan_requirements
+          get_input: port_a_single_1a_t1_port_0_vlan_requirements
         subinterface_indicator: false
         related_networks:
-          get_input: port_1a_t2_port_related_networks
+          get_input: port_a_single_1a_t1_port_0_related_networks
         ip_requirements:
-          get_input: port_1a_t2_port_ip_requirements
+          get_input: port_a_single_1a_t1_port_0_ip_requirements
         network_role_tag:
-          get_input: port_1a_t2_port_network_role_tag
+          get_input: port_a_single_1a_t1_port_0_network_role_tag
         mac_requirements:
-          get_input: port_1a_t2_port_mac_requirements
+          get_input: port_a_single_1a_t1_port_0_mac_requirements
         order:
-          get_input: port_1a_t2_port_order
+          get_input: port_a_single_1a_t1_port_0_order
         network_role:
-          get_input: port_1a_t2_port_network_role
+          get_input: port_a_single_1a_t1_port_0_network_role
         subnetpoolid:
-          get_input: port_1a_t2_port_subnetpoolid
+          get_input: port_a_single_1a_t1_port_0_subnetpoolid
         network:
           get_input:
-          - port_1a_t2_port_network
+          - port_a_single_1a_t1_port_0_network
           - index_value
       requirements:
       - binding:
@@ -207,39 +207,42 @@ topology_template:
           node: a_single_1a
           relationship: tosca.relationships.network.BindsTo
   outputs:
-    a_single_1a_instance_name:
+    a_single_1a_a_single_1a_t1_port_0_tenant_id:
       type: string
       value:
         get_attribute:
-        - a_single_1a
-        - instance_name
-    a_single_1a_1a_t1_port_tenant_id:
+        - a_single_1a_a_single_1a_t1_port_0
+        - tenant_id
+    a_single_1a_instance_name:
       type: string
       value:
         get_attribute:
-        - a_single_1a_1a_t1_port
-        - tenant_id
+        - a_single_1a
+        - instance_name
   substitution_mappings:
     node_type: org.openecomp.resource.abstract.nodes.a_single_1a
     capabilities:
       disk.read.bytes_a_single_1a:
       - a_single_1a
       - disk.read.bytes
-      network.incoming.bytes.rate_a_single_1a_1a_t2_port:
-      - a_single_1a_1a_t2_port
-      - network.incoming.bytes.rate
       disk.usage_a_single_1a:
       - a_single_1a
       - disk.usage
-      attachment_a_single_1a_1a_t2_port:
-      - a_single_1a_1a_t2_port
-      - attachment
+      network.incoming.bytes.rate_a_single_1a_a_single_1a_t2_port_0:
+      - a_single_1a_a_single_1a_t2_port_0
+      - network.incoming.bytes.rate
       scalable_a_single_1a:
       - a_single_1a
       - scalable
-      network.outgoing.bytes.rate_a_single_1a_1a_t2_port:
-      - a_single_1a_1a_t2_port
-      - network.outgoing.bytes.rate
+      network.incoming.packets.rate_a_single_1a_a_single_1a_t2_port_0:
+      - a_single_1a_a_single_1a_t2_port_0
+      - network.incoming.packets.rate
+      network.incoming.bytes_a_single_1a_a_single_1a_t2_port_0:
+      - a_single_1a_a_single_1a_t2_port_0
+      - network.incoming.bytes
+      network.incoming.bytes.rate_a_single_1a_a_single_1a_t1_port_0:
+      - a_single_1a_a_single_1a_t1_port_0
+      - network.incoming.bytes.rate
       host_a_single_1a:
       - a_single_1a
       - host
@@ -252,27 +255,24 @@ topology_template:
       memory.resident_a_single_1a:
       - a_single_1a
       - memory.resident
-      network.incoming.packets.rate_a_single_1a_1a_t2_port:
-      - a_single_1a_1a_t2_port
-      - network.incoming.packets.rate
       cpu.delta_a_single_1a:
       - a_single_1a
       - cpu.delta
-      forwarder_a_single_1a_1a_t1_port:
-      - a_single_1a_1a_t1_port
-      - forwarder
+      network.incoming.bytes_a_single_1a_a_single_1a_t1_port_0:
+      - a_single_1a_a_single_1a_t1_port_0
+      - network.incoming.bytes
       disk.device.write.requests_a_single_1a:
       - a_single_1a
       - disk.device.write.requests
-      network.incoming.bytes.rate_a_single_1a_1a_t1_port:
-      - a_single_1a_1a_t1_port
-      - network.incoming.bytes.rate
       disk.iops_a_single_1a:
       - a_single_1a
       - disk.iops
-      network.incoming.bytes_a_single_1a_1a_t1_port:
-      - a_single_1a_1a_t1_port
-      - network.incoming.bytes
+      network.outgoing.bytes_a_single_1a_a_single_1a_t2_port_0:
+      - a_single_1a_a_single_1a_t2_port_0
+      - network.outgoing.bytes
+      forwarder_a_single_1a_a_single_1a_t1_port_0:
+      - a_single_1a_a_single_1a_t1_port_0
+      - forwarder
       cpu_util_a_single_1a:
       - a_single_1a
       - cpu_util
@@ -282,42 +282,39 @@ topology_template:
       disk.device.usage_a_single_1a:
       - a_single_1a
       - disk.device.usage
-      network.incoming.packets.rate_a_single_1a_1a_t1_port:
-      - a_single_1a_1a_t1_port
-      - network.incoming.packets.rate
-      network.outgoing.packets.rate_a_single_1a_1a_t2_port:
-      - a_single_1a_1a_t2_port
-      - network.outgoing.packets.rate
+      attachment_a_single_1a_a_single_1a_t1_port_0:
+      - a_single_1a_a_single_1a_t1_port_0
+      - attachment
       disk.read.requests_a_single_1a:
       - a_single_1a
       - disk.read.requests
       disk.read.bytes.rate_a_single_1a:
       - a_single_1a
       - disk.read.bytes.rate
+      binding_a_single_1a_a_single_1a_t2_port_0:
+      - a_single_1a_a_single_1a_t2_port_0
+      - binding
       disk.write.bytes.rate_a_single_1a:
       - a_single_1a
       - disk.write.bytes.rate
-      attachment_a_single_1a_1a_t1_port:
-      - a_single_1a_1a_t1_port
-      - attachment
+      feature_a_single_1a_a_single_1a_t2_port_0:
+      - a_single_1a_a_single_1a_t2_port_0
+      - feature
       cpu_a_single_1a:
       - a_single_1a
       - cpu
       memory.usage_a_single_1a:
       - a_single_1a
       - memory.usage
-      forwarder_a_single_1a_1a_t2_port:
-      - a_single_1a_1a_t2_port
-      - forwarder
+      network.outpoing.packets_a_single_1a_a_single_1a_t1_port_0:
+      - a_single_1a_a_single_1a_t1_port_0
+      - network.outpoing.packets
       disk.device.write.requests.rate_a_single_1a:
       - a_single_1a
       - disk.device.write.requests.rate
-      binding_a_single_1a_1a_t2_port:
-      - a_single_1a_1a_t2_port
-      - binding
-      network.incoming.packets_a_single_1a_1a_t2_port:
-      - a_single_1a_1a_t2_port
-      - network.incoming.packets
+      network.outgoing.packets.rate_a_single_1a_a_single_1a_t2_port_0:
+      - a_single_1a_a_single_1a_t2_port_0
+      - network.outgoing.packets.rate
       disk.device.read.requests_a_single_1a:
       - a_single_1a
       - disk.device.read.requests
@@ -333,24 +330,12 @@ topology_template:
       disk.latency_a_single_1a:
       - a_single_1a
       - disk.latency
-      network.outgoing.bytes_a_single_1a_1a_t2_port:
-      - a_single_1a_1a_t2_port
-      - network.outgoing.bytes
       disk.device.allocation_a_single_1a:
       - a_single_1a
       - disk.device.allocation
       disk.write.bytes_a_single_1a:
       - a_single_1a
       - disk.write.bytes
-      feature_a_single_1a_1a_t1_port:
-      - a_single_1a_1a_t1_port
-      - feature
-      network.outpoing.packets_a_single_1a_1a_t2_port:
-      - a_single_1a_1a_t2_port
-      - network.outpoing.packets
-      network.outpoing.packets_a_single_1a_1a_t1_port:
-      - a_single_1a_1a_t1_port
-      - network.outpoing.packets
       disk.device.read.bytes.rate_a_single_1a:
       - a_single_1a
       - disk.device.read.bytes.rate
@@ -360,78 +345,93 @@ topology_template:
       disk.device.write.bytes.rate_a_single_1a:
       - a_single_1a
       - disk.device.write.bytes.rate
+      network.incoming.packets_a_single_1a_a_single_1a_t2_port_0:
+      - a_single_1a_a_single_1a_t2_port_0
+      - network.incoming.packets
       memory_a_single_1a:
       - a_single_1a
       - memory
       disk.allocation_a_single_1a:
       - a_single_1a
       - disk.allocation
-      network.outgoing.packets.rate_a_single_1a_1a_t1_port:
-      - a_single_1a_1a_t1_port
-      - network.outgoing.packets.rate
-      feature_a_single_1a_1a_t2_port:
-      - a_single_1a_1a_t2_port
-      - feature
+      network.incoming.packets_a_single_1a_a_single_1a_t1_port_0:
+      - a_single_1a_a_single_1a_t1_port_0
+      - network.incoming.packets
+      network.outgoing.bytes.rate_a_single_1a_a_single_1a_t2_port_0:
+      - a_single_1a_a_single_1a_t2_port_0
+      - network.outgoing.bytes.rate
+      network.outgoing.bytes.rate_a_single_1a_a_single_1a_t1_port_0:
+      - a_single_1a_a_single_1a_t1_port_0
+      - network.outgoing.bytes.rate
       disk.capacity_a_single_1a:
       - a_single_1a
       - disk.capacity
       disk.device.read.bytes_a_single_1a:
       - a_single_1a
       - disk.device.read.bytes
-      network.incoming.packets_a_single_1a_1a_t1_port:
-      - a_single_1a_1a_t1_port
-      - network.incoming.packets
       feature_a_single_1a:
       - a_single_1a
       - feature
-      network.outgoing.bytes_a_single_1a_1a_t1_port:
-      - a_single_1a_1a_t1_port
+      network.outgoing.bytes_a_single_1a_a_single_1a_t1_port_0:
+      - a_single_1a_a_single_1a_t1_port_0
       - network.outgoing.bytes
+      forwarder_a_single_1a_a_single_1a_t2_port_0:
+      - a_single_1a_a_single_1a_t2_port_0
+      - forwarder
       disk.ephemeral.size_a_single_1a:
       - a_single_1a
       - disk.ephemeral.size
       vcpus_a_single_1a:
       - a_single_1a
       - vcpus
-      binding_a_single_1a_1a_t1_port:
-      - a_single_1a_1a_t1_port
-      - binding
+      attachment_a_single_1a_a_single_1a_t2_port_0:
+      - a_single_1a_a_single_1a_t2_port_0
+      - attachment
+      network.incoming.packets.rate_a_single_1a_a_single_1a_t1_port_0:
+      - a_single_1a_a_single_1a_t1_port_0
+      - network.incoming.packets.rate
       disk.device.iops_a_single_1a:
       - a_single_1a
       - disk.device.iops
       disk.write.requests_a_single_1a:
       - a_single_1a
       - disk.write.requests
+      network.outpoing.packets_a_single_1a_a_single_1a_t2_port_0:
+      - a_single_1a_a_single_1a_t2_port_0
+      - network.outpoing.packets
       disk.device.read.requests.rate_a_single_1a:
       - a_single_1a
       - disk.device.read.requests.rate
+      feature_a_single_1a_a_single_1a_t1_port_0:
+      - a_single_1a_a_single_1a_t1_port_0
+      - feature
       disk.device.capacity_a_single_1a:
       - a_single_1a
       - disk.device.capacity
+      binding_a_single_1a_a_single_1a_t1_port_0:
+      - a_single_1a_a_single_1a_t1_port_0
+      - binding
       disk.write.requests.rate_a_single_1a:
       - a_single_1a
       - disk.write.requests.rate
-      network.incoming.bytes_a_single_1a_1a_t2_port:
-      - a_single_1a_1a_t2_port
-      - network.incoming.bytes
-      network.outgoing.bytes.rate_a_single_1a_1a_t1_port:
-      - a_single_1a_1a_t1_port
-      - network.outgoing.bytes.rate
+      network.outgoing.packets.rate_a_single_1a_a_single_1a_t1_port_0:
+      - a_single_1a_a_single_1a_t1_port_0
+      - network.outgoing.packets.rate
     requirements:
-      link_a_single_1a_1a_t2_port:
-      - a_single_1a_1a_t2_port
+      link_a_single_1a_a_single_1a_t2_port_0:
+      - a_single_1a_a_single_1a_t2_port_0
       - link
-      link_a_single_1a_1a_t1_port:
-      - a_single_1a_1a_t1_port
+      link_a_single_1a_a_single_1a_t1_port_0:
+      - a_single_1a_a_single_1a_t1_port_0
       - link
       dependency_a_single_1a:
       - a_single_1a
       - dependency
-      dependency_a_single_1a_1a_t2_port:
-      - a_single_1a_1a_t2_port
+      dependency_a_single_1a_a_single_1a_t2_port_0:
+      - a_single_1a_a_single_1a_t2_port_0
       - dependency
-      dependency_a_single_1a_1a_t1_port:
-      - a_single_1a_1a_t1_port
+      dependency_a_single_1a_a_single_1a_t1_port_0:
+      - a_single_1a_a_single_1a_t1_port_0
       - dependency
       local_storage_a_single_1a:
       - a_single_1a
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_b_single_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_b_single_1bServiceTemplate.yaml
index 8bf062f993..cd92a68dd2 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_b_single_1bServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_b_single_1bServiceTemplate.yaml
@@ -11,35 +11,45 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
-    port_1b_t1_port_order:
-      type: integer
+    port_b_single_1b_t1_port_0_network_role_tag:
+      type: string
+      required: true
+    port_b_single_1b_t1_port_0_related_networks:
+      type: list
       required: true
-    port_1b_t1_port_network_role:
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+    port_b_single_1b_t2_port_0_subnetpoolid:
       type: string
       required: true
-    port_1b_t1_port_exCP_naming:
-      type: org.openecomp.datatypes.Naming
+    port_b_single_1b_t1_port_0_network_role:
+      type: string
+      required: true
+    port_b_single_1b_t2_port_0_network:
+      type: list
       required: true
+      entry_schema:
+        type: string
     vm_flavor_name:
       type: string
       required: true
-    port_1b_t2_port_related_networks:
+    port_b_single_1b_t1_port_0_vlan_requirements:
       type: list
       required: true
       entry_schema:
-        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
-    port_1b_t1_port_ip_requirements:
+        type: org.openecomp.datatypes.network.VlanRequirements
+    port_b_single_1b_t2_port_0_related_networks:
       type: list
       required: true
       entry_schema:
-        type: org.openecomp.datatypes.network.IpRequirements
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     vm_image_name:
       type: string
       required: true
-    port_1b_t2_port_network_role:
-      type: string
+    port_b_single_1b_t2_port_0_order:
+      type: integer
       required: true
-    port_1b_t2_port_order:
+    port_b_single_1b_t1_port_0_order:
       type: integer
       required: true
     compute_b_single_1b_user_data_format:
@@ -47,28 +57,27 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    port_1b_t2_port_exCP_naming:
-      type: org.openecomp.datatypes.Naming
-      required: true
-    port_1b_t2_port_network_role_tag:
-      type: string
+    port_b_single_1b_t2_port_0_vlan_requirements:
+      type: list
       required: true
-    port_1b_t2_port_subnetpoolid:
+      entry_schema:
+        type: org.openecomp.datatypes.network.VlanRequirements
+    port_b_single_1b_t2_port_0_network_role:
       type: string
       required: true
-    port_1b_t1_port_related_networks:
+    port_b_single_1b_t1_port_0_ip_requirements:
       type: list
       required: true
       entry_schema:
-        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
-    port_1b_t2_port_mac_requirements:
-      type: org.openecomp.datatypes.network.MacRequirements
-      required: true
+        type: org.openecomp.datatypes.network.IpRequirements
     compute_b_single_1b_availability_zone:
       type: list
       required: true
       entry_schema:
         type: string
+    port_b_single_1b_t1_port_0_exCP_naming:
+      type: org.openecomp.datatypes.Naming
+      required: true
     index_value:
       type: integer
       description: Index value of this substitution service template runtime instance
@@ -81,35 +90,26 @@ topology_template:
       required: true
       entry_schema:
         type: json
-    port_1b_t2_port_vlan_requirements:
-      type: list
-      required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.VlanRequirements
-    port_1b_t2_port_ip_requirements:
-      type: list
+    port_b_single_1b_t1_port_0_mac_requirements:
+      type: org.openecomp.datatypes.network.MacRequirements
       required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.IpRequirements
-    port_1b_t1_port_network_role_tag:
+    port_b_single_1b_t1_port_0_subnetpoolid:
       type: string
       required: true
-    port_1b_t1_port_subnetpoolid:
+    port_b_single_1b_t2_port_0_network_role_tag:
       type: string
       required: true
-    port_1b_t1_port_mac_requirements:
-      type: org.openecomp.datatypes.network.MacRequirements
-      required: true
-    port_1b_t2_port_network:
+    port_b_single_1b_t2_port_0_ip_requirements:
       type: list
       required: true
       entry_schema:
-        type: string
-    port_1b_t1_port_vlan_requirements:
-      type: list
+        type: org.openecomp.datatypes.network.IpRequirements
+    port_b_single_1b_t2_port_0_mac_requirements:
+      type: org.openecomp.datatypes.network.MacRequirements
+      required: true
+    port_b_single_1b_t2_port_0_exCP_naming:
+      type: org.openecomp.datatypes.Naming
       required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.VlanRequirements
     compute_b_single_1b_name:
       type: list
       required: true
@@ -139,63 +139,63 @@ topology_template:
           get_input:
           - compute_b_single_1b_user_data_format
           - index_value
-    b_single_1b_1b_t1_port:
+    b_single_1b_b_single_1b_t2_port_0:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         exCP_naming:
-          get_input: port_1b_t1_port_exCP_naming
+          get_input: port_b_single_1b_t2_port_0_exCP_naming
         vlan_requirements:
-          get_input: port_1b_t1_port_vlan_requirements
+          get_input: port_b_single_1b_t2_port_0_vlan_requirements
         subinterface_indicator: false
         related_networks:
-          get_input: port_1b_t1_port_related_networks
+          get_input: port_b_single_1b_t2_port_0_related_networks
         ip_requirements:
-          get_input: port_1b_t1_port_ip_requirements
+          get_input: port_b_single_1b_t2_port_0_ip_requirements
         network_role_tag:
-          get_input: port_1b_t1_port_network_role_tag
+          get_input: port_b_single_1b_t2_port_0_network_role_tag
         mac_requirements:
-          get_input: port_1b_t1_port_mac_requirements
+          get_input: port_b_single_1b_t2_port_0_mac_requirements
         order:
-          get_input: port_1b_t1_port_order
+          get_input: port_b_single_1b_t2_port_0_order
         network_role:
-          get_input: port_1b_t1_port_network_role
+          get_input: port_b_single_1b_t2_port_0_network_role
         subnetpoolid:
-          get_input: port_1b_t1_port_subnetpoolid
+          get_input: port_b_single_1b_t2_port_0_subnetpoolid
         network:
-          get_attribute:
-          - b_single_1b
-          - accessIPv6
+          get_input:
+          - port_b_single_1b_t2_port_0_network
+          - index_value
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
           node: b_single_1b
           relationship: tosca.relationships.network.BindsTo
-    b_single_1b_1b_t2_port:
+    b_single_1b_b_single_1b_t1_port_0:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         exCP_naming:
-          get_input: port_1b_t2_port_exCP_naming
+          get_input: port_b_single_1b_t1_port_0_exCP_naming
         vlan_requirements:
-          get_input: port_1b_t2_port_vlan_requirements
+          get_input: port_b_single_1b_t1_port_0_vlan_requirements
         subinterface_indicator: false
         related_networks:
-          get_input: port_1b_t2_port_related_networks
+          get_input: port_b_single_1b_t1_port_0_related_networks
         ip_requirements:
-          get_input: port_1b_t2_port_ip_requirements
+          get_input: port_b_single_1b_t1_port_0_ip_requirements
         network_role_tag:
-          get_input: port_1b_t2_port_network_role_tag
+          get_input: port_b_single_1b_t1_port_0_network_role_tag
         mac_requirements:
-          get_input: port_1b_t2_port_mac_requirements
+          get_input: port_b_single_1b_t1_port_0_mac_requirements
         order:
-          get_input: port_1b_t2_port_order
+          get_input: port_b_single_1b_t1_port_0_order
         network_role:
-          get_input: port_1b_t2_port_network_role
+          get_input: port_b_single_1b_t1_port_0_network_role
         subnetpoolid:
-          get_input: port_1b_t2_port_subnetpoolid
+          get_input: port_b_single_1b_t1_port_0_subnetpoolid
         network:
-          get_input:
-          - port_1b_t2_port_network
-          - index_value
+          get_attribute:
+          - b_single_1b
+          - accessIPv6
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
@@ -208,21 +208,15 @@ topology_template:
         get_attribute:
         - b_single_1b
         - instance_name
-    b_single_1b_1b_t1_port_tenant_id:
+    b_single_1b_b_single_1b_t1_port_0_tenant_id:
       type: string
       value:
         get_attribute:
-        - b_single_1b_1b_t1_port
+        - b_single_1b_b_single_1b_t1_port_0
         - tenant_id
   substitution_mappings:
     node_type: org.openecomp.resource.abstract.nodes.b_single_1b
     capabilities:
-      attachment_b_single_1b_1b_t2_port:
-      - b_single_1b_1b_t2_port
-      - attachment
-      forwarder_b_single_1b_1b_t2_port:
-      - b_single_1b_1b_t2_port
-      - forwarder
       endpoint_b_single_1b:
       - b_single_1b
       - endpoint
@@ -232,15 +226,30 @@ topology_template:
       disk.iops_b_single_1b:
       - b_single_1b
       - disk.iops
-      network.incoming.bytes.rate_b_single_1b_1b_t2_port:
-      - b_single_1b_1b_t2_port
+      network.incoming.bytes_b_single_1b_b_single_1b_t1_port_0:
+      - b_single_1b_b_single_1b_t1_port_0
+      - network.incoming.bytes
+      network.incoming.packets.rate_b_single_1b_b_single_1b_t2_port_0:
+      - b_single_1b_b_single_1b_t2_port_0
+      - network.incoming.packets.rate
+      network.incoming.bytes_b_single_1b_b_single_1b_t2_port_0:
+      - b_single_1b_b_single_1b_t2_port_0
+      - network.incoming.bytes
+      binding_b_single_1b_b_single_1b_t1_port_0:
+      - b_single_1b_b_single_1b_t1_port_0
+      - binding
+      feature_b_single_1b_b_single_1b_t2_port_0:
+      - b_single_1b_b_single_1b_t2_port_0
+      - feature
+      feature_b_single_1b_b_single_1b_t1_port_0:
+      - b_single_1b_b_single_1b_t1_port_0
+      - feature
+      network.incoming.bytes.rate_b_single_1b_b_single_1b_t1_port_0:
+      - b_single_1b_b_single_1b_t1_port_0
       - network.incoming.bytes.rate
-      network.outgoing.bytes.rate_b_single_1b_1b_t2_port:
-      - b_single_1b_1b_t2_port
-      - network.outgoing.bytes.rate
-      forwarder_b_single_1b_1b_t1_port:
-      - b_single_1b_1b_t1_port
-      - forwarder
+      binding_b_single_1b_b_single_1b_t2_port_0:
+      - b_single_1b_b_single_1b_t2_port_0
+      - binding
       scalable_b_single_1b:
       - b_single_1b
       - scalable
@@ -250,24 +259,30 @@ topology_template:
       os_b_single_1b:
       - b_single_1b
       - os
+      forwarder_b_single_1b_b_single_1b_t2_port_0:
+      - b_single_1b_b_single_1b_t2_port_0
+      - forwarder
+      forwarder_b_single_1b_b_single_1b_t1_port_0:
+      - b_single_1b_b_single_1b_t1_port_0
+      - forwarder
       vcpus_b_single_1b:
       - b_single_1b
       - vcpus
       cpu_b_single_1b:
       - b_single_1b
       - cpu
+      network.incoming.bytes.rate_b_single_1b_b_single_1b_t2_port_0:
+      - b_single_1b_b_single_1b_t2_port_0
+      - network.incoming.bytes.rate
       disk.device.read.requests.rate_b_single_1b:
       - b_single_1b
       - disk.device.read.requests.rate
-      network.incoming.packets.rate_b_single_1b_1b_t2_port:
-      - b_single_1b_1b_t2_port
+      network.incoming.packets.rate_b_single_1b_b_single_1b_t1_port_0:
+      - b_single_1b_b_single_1b_t1_port_0
       - network.incoming.packets.rate
       instance_b_single_1b:
       - b_single_1b
       - instance
-      network.incoming.bytes.rate_b_single_1b_1b_t1_port:
-      - b_single_1b_1b_t1_port
-      - network.incoming.bytes.rate
       disk.read.bytes_b_single_1b:
       - b_single_1b
       - disk.read.bytes
@@ -277,45 +292,36 @@ topology_template:
       disk.usage_b_single_1b:
       - b_single_1b
       - disk.usage
-      network.incoming.bytes_b_single_1b_1b_t1_port:
-      - b_single_1b_1b_t1_port
-      - network.incoming.bytes
       disk.device.allocation_b_single_1b:
       - b_single_1b
       - disk.device.allocation
-      network.outgoing.packets.rate_b_single_1b_1b_t2_port:
-      - b_single_1b_1b_t2_port
+      network.outgoing.packets.rate_b_single_1b_b_single_1b_t2_port_0:
+      - b_single_1b_b_single_1b_t2_port_0
       - network.outgoing.packets.rate
+      network.outpoing.packets_b_single_1b_b_single_1b_t1_port_0:
+      - b_single_1b_b_single_1b_t1_port_0
+      - network.outpoing.packets
+      network.outgoing.bytes_b_single_1b_b_single_1b_t2_port_0:
+      - b_single_1b_b_single_1b_t2_port_0
+      - network.outgoing.bytes
       disk.device.capacity_b_single_1b:
       - b_single_1b
       - disk.device.capacity
       disk.latency_b_single_1b:
       - b_single_1b
       - disk.latency
-      network.incoming.packets_b_single_1b_1b_t2_port:
-      - b_single_1b_1b_t2_port
-      - network.incoming.packets
-      network.incoming.packets.rate_b_single_1b_1b_t1_port:
-      - b_single_1b_1b_t1_port
-      - network.incoming.packets.rate
-      attachment_b_single_1b_1b_t1_port:
-      - b_single_1b_1b_t1_port
+      attachment_b_single_1b_b_single_1b_t1_port_0:
+      - b_single_1b_b_single_1b_t1_port_0
       - attachment
       disk.device.write.requests_b_single_1b:
       - b_single_1b
       - disk.device.write.requests
-      binding_b_single_1b_1b_t2_port:
-      - b_single_1b_1b_t2_port
-      - binding
       disk.ephemeral.size_b_single_1b:
       - b_single_1b
       - disk.ephemeral.size
       disk.write.requests.rate_b_single_1b:
       - b_single_1b
       - disk.write.requests.rate
-      network.outpoing.packets_b_single_1b_1b_t2_port:
-      - b_single_1b_1b_t2_port
-      - network.outpoing.packets
       disk.device.iops_b_single_1b:
       - b_single_1b
       - disk.device.iops
@@ -325,15 +331,18 @@ topology_template:
       memory.resident_b_single_1b:
       - b_single_1b
       - memory.resident
+      network.outgoing.bytes.rate_b_single_1b_b_single_1b_t2_port_0:
+      - b_single_1b_b_single_1b_t2_port_0
+      - network.outgoing.bytes.rate
       disk.root.size_b_single_1b:
       - b_single_1b
       - disk.root.size
-      feature_b_single_1b_1b_t1_port:
-      - b_single_1b_1b_t1_port
-      - feature
-      network.outgoing.bytes_b_single_1b_1b_t2_port:
-      - b_single_1b_1b_t2_port
-      - network.outgoing.bytes
+      network.incoming.packets_b_single_1b_b_single_1b_t1_port_0:
+      - b_single_1b_b_single_1b_t1_port_0
+      - network.incoming.packets
+      network.outgoing.bytes.rate_b_single_1b_b_single_1b_t1_port_0:
+      - b_single_1b_b_single_1b_t1_port_0
+      - network.outgoing.bytes.rate
       disk.capacity_b_single_1b:
       - b_single_1b
       - disk.capacity
@@ -352,45 +361,39 @@ topology_template:
       disk.write.requests_b_single_1b:
       - b_single_1b
       - disk.write.requests
-      network.outgoing.packets.rate_b_single_1b_1b_t1_port:
-      - b_single_1b_1b_t1_port
-      - network.outgoing.packets.rate
+      network.incoming.packets_b_single_1b_b_single_1b_t2_port_0:
+      - b_single_1b_b_single_1b_t2_port_0
+      - network.incoming.packets
       disk.device.usage_b_single_1b:
       - b_single_1b
       - disk.device.usage
       disk.read.bytes.rate_b_single_1b:
       - b_single_1b
       - disk.read.bytes.rate
-      network.outgoing.bytes_b_single_1b_1b_t1_port:
-      - b_single_1b_1b_t1_port
-      - network.outgoing.bytes
       disk.device.read.requests_b_single_1b:
       - b_single_1b
       - disk.device.read.requests
-      network.incoming.packets_b_single_1b_1b_t1_port:
-      - b_single_1b_1b_t1_port
-      - network.incoming.packets
-      binding_b_single_1b_1b_t1_port:
-      - b_single_1b_1b_t1_port
-      - binding
-      network.outpoing.packets_b_single_1b_1b_t1_port:
-      - b_single_1b_1b_t1_port
-      - network.outpoing.packets
+      attachment_b_single_1b_b_single_1b_t2_port_0:
+      - b_single_1b_b_single_1b_t2_port_0
+      - attachment
       disk.device.write.requests.rate_b_single_1b:
       - b_single_1b
       - disk.device.write.requests.rate
+      network.outgoing.packets.rate_b_single_1b_b_single_1b_t1_port_0:
+      - b_single_1b_b_single_1b_t1_port_0
+      - network.outgoing.packets.rate
+      network.outpoing.packets_b_single_1b_b_single_1b_t2_port_0:
+      - b_single_1b_b_single_1b_t2_port_0
+      - network.outpoing.packets
       memory.usage_b_single_1b:
       - b_single_1b
       - memory.usage
+      network.outgoing.bytes_b_single_1b_b_single_1b_t1_port_0:
+      - b_single_1b_b_single_1b_t1_port_0
+      - network.outgoing.bytes
       disk.write.bytes.rate_b_single_1b:
       - b_single_1b
       - disk.write.bytes.rate
-      network.incoming.bytes_b_single_1b_1b_t2_port:
-      - b_single_1b_1b_t2_port
-      - network.incoming.bytes
-      network.outgoing.bytes.rate_b_single_1b_1b_t1_port:
-      - b_single_1b_1b_t1_port
-      - network.outgoing.bytes.rate
       cpu.delta_b_single_1b:
       - b_single_1b
       - cpu.delta
@@ -409,25 +412,22 @@ topology_template:
       binding_b_single_1b:
       - b_single_1b
       - binding
-      feature_b_single_1b_1b_t2_port:
-      - b_single_1b_1b_t2_port
-      - feature
     requirements:
       local_storage_b_single_1b:
       - b_single_1b
       - local_storage
-      dependency_b_single_1b_1b_t1_port:
-      - b_single_1b_1b_t1_port
-      - dependency
+      link_b_single_1b_b_single_1b_t1_port_0:
+      - b_single_1b_b_single_1b_t1_port_0
+      - link
       dependency_b_single_1b:
       - b_single_1b
       - dependency
-      link_b_single_1b_1b_t2_port:
-      - b_single_1b_1b_t2_port
-      - link
-      link_b_single_1b_1b_t1_port:
-      - b_single_1b_1b_t1_port
-      - link
-      dependency_b_single_1b_1b_t2_port:
-      - b_single_1b_1b_t2_port
-      - dependency
\ No newline at end of file
+      dependency_b_single_1b_b_single_1b_t2_port_0:
+      - b_single_1b_b_single_1b_t2_port_0
+      - dependency
+      dependency_b_single_1b_b_single_1b_t1_port_0:
+      - b_single_1b_b_single_1b_t1_port_0
+      - dependency
+      link_b_single_1b_b_single_1b_t2_port_0:
+      - b_single_1b_b_single_1b_t2_port_0
+      - link
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_b_single_1b_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_b_single_1b_1ServiceTemplate.yaml
index 1da7eb2953..1eb37ca97d 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_b_single_1b_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_b_single_1b_1ServiceTemplate.yaml
@@ -11,35 +11,45 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
-    port_1b_t1_port_order:
-      type: integer
+    port_b_single_1b_t1_port_0_network_role_tag:
+      type: string
+      required: true
+    port_b_single_1b_t1_port_0_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+    port_b_single_1b_t2_port_0_subnetpoolid:
+      type: string
       required: true
-    port_1b_t1_port_network_role:
+    port_b_single_1b_t1_port_0_network_role:
       type: string
       required: true
-    port_1b_t1_port_exCP_naming:
-      type: org.openecomp.datatypes.Naming
+    port_b_single_1b_t2_port_0_network:
+      type: list
       required: true
+      entry_schema:
+        type: string
     vm_flavor_name:
       type: string
       required: true
-    port_1b_t2_port_related_networks:
+    port_b_single_1b_t1_port_0_vlan_requirements:
       type: list
       required: true
       entry_schema:
-        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
-    port_1b_t1_port_ip_requirements:
+        type: org.openecomp.datatypes.network.VlanRequirements
+    port_b_single_1b_t2_port_0_related_networks:
       type: list
       required: true
       entry_schema:
-        type: org.openecomp.datatypes.network.IpRequirements
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     vm_image_name:
       type: string
       required: true
-    port_1b_t2_port_network_role:
-      type: string
+    port_b_single_1b_t2_port_0_order:
+      type: integer
       required: true
-    port_1b_t2_port_order:
+    port_b_single_1b_t1_port_0_order:
       type: integer
       required: true
     compute_b_single_1b_user_data_format:
@@ -47,28 +57,27 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    port_1b_t2_port_exCP_naming:
-      type: org.openecomp.datatypes.Naming
-      required: true
-    port_1b_t2_port_network_role_tag:
-      type: string
+    port_b_single_1b_t2_port_0_vlan_requirements:
+      type: list
       required: true
-    port_1b_t2_port_subnetpoolid:
+      entry_schema:
+        type: org.openecomp.datatypes.network.VlanRequirements
+    port_b_single_1b_t2_port_0_network_role:
       type: string
       required: true
-    port_1b_t1_port_related_networks:
+    port_b_single_1b_t1_port_0_ip_requirements:
       type: list
       required: true
       entry_schema:
-        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
-    port_1b_t2_port_mac_requirements:
-      type: org.openecomp.datatypes.network.MacRequirements
-      required: true
+        type: org.openecomp.datatypes.network.IpRequirements
     compute_b_single_1b_availability_zone:
       type: list
       required: true
       entry_schema:
         type: string
+    port_b_single_1b_t1_port_0_exCP_naming:
+      type: org.openecomp.datatypes.Naming
+      required: true
     index_value:
       type: integer
       description: Index value of this substitution service template runtime instance
@@ -81,40 +90,31 @@ topology_template:
       required: true
       entry_schema:
         type: json
-    port_1b_t2_port_vlan_requirements:
-      type: list
-      required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.VlanRequirements
-    port_1b_t2_port_ip_requirements:
-      type: list
+    port_b_single_1b_t1_port_0_mac_requirements:
+      type: org.openecomp.datatypes.network.MacRequirements
       required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.IpRequirements
-    port_1b_t1_port_network_role_tag:
+    port_b_single_1b_t1_port_0_subnetpoolid:
       type: string
       required: true
-    port_1b_t1_port_subnetpoolid:
+    port_b_single_1b_t2_port_0_network_role_tag:
       type: string
       required: true
-    port_1b_t1_port_mac_requirements:
-      type: org.openecomp.datatypes.network.MacRequirements
-      required: true
-    port_1b_t2_port_network:
+    port_b_single_1b_t1_port_0_network:
       type: list
       required: true
       entry_schema:
         type: string
-    port_1b_t1_port_vlan_requirements:
+    port_b_single_1b_t2_port_0_ip_requirements:
       type: list
       required: true
       entry_schema:
-        type: org.openecomp.datatypes.network.VlanRequirements
-    port_1b_t1_port_network:
-      type: list
+        type: org.openecomp.datatypes.network.IpRequirements
+    port_b_single_1b_t2_port_0_mac_requirements:
+      type: org.openecomp.datatypes.network.MacRequirements
+      required: true
+    port_b_single_1b_t2_port_0_exCP_naming:
+      type: org.openecomp.datatypes.Naming
       required: true
-      entry_schema:
-        type: string
     compute_b_single_1b_name:
       type: list
       required: true
@@ -144,62 +144,62 @@ topology_template:
           get_input:
           - compute_b_single_1b_user_data_format
           - index_value
-    b_single_1b_1b_t1_port:
+    b_single_1b_b_single_1b_t2_port_0:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         exCP_naming:
-          get_input: port_1b_t1_port_exCP_naming
+          get_input: port_b_single_1b_t2_port_0_exCP_naming
         vlan_requirements:
-          get_input: port_1b_t1_port_vlan_requirements
+          get_input: port_b_single_1b_t2_port_0_vlan_requirements
         subinterface_indicator: false
         related_networks:
-          get_input: port_1b_t1_port_related_networks
+          get_input: port_b_single_1b_t2_port_0_related_networks
         ip_requirements:
-          get_input: port_1b_t1_port_ip_requirements
+          get_input: port_b_single_1b_t2_port_0_ip_requirements
         network_role_tag:
-          get_input: port_1b_t1_port_network_role_tag
+          get_input: port_b_single_1b_t2_port_0_network_role_tag
         mac_requirements:
-          get_input: port_1b_t1_port_mac_requirements
+          get_input: port_b_single_1b_t2_port_0_mac_requirements
         order:
-          get_input: port_1b_t1_port_order
+          get_input: port_b_single_1b_t2_port_0_order
         network_role:
-          get_input: port_1b_t1_port_network_role
+          get_input: port_b_single_1b_t2_port_0_network_role
         subnetpoolid:
-          get_input: port_1b_t1_port_subnetpoolid
+          get_input: port_b_single_1b_t2_port_0_subnetpoolid
         network:
           get_input:
-          - port_1b_t1_port_network
+          - port_b_single_1b_t2_port_0_network
           - index_value
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
           node: b_single_1b
           relationship: tosca.relationships.network.BindsTo
-    b_single_1b_1b_t2_port:
+    b_single_1b_b_single_1b_t1_port_0:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         exCP_naming:
-          get_input: port_1b_t2_port_exCP_naming
+          get_input: port_b_single_1b_t1_port_0_exCP_naming
         vlan_requirements:
-          get_input: port_1b_t2_port_vlan_requirements
+          get_input: port_b_single_1b_t1_port_0_vlan_requirements
         subinterface_indicator: false
         related_networks:
-          get_input: port_1b_t2_port_related_networks
+          get_input: port_b_single_1b_t1_port_0_related_networks
         ip_requirements:
-          get_input: port_1b_t2_port_ip_requirements
+          get_input: port_b_single_1b_t1_port_0_ip_requirements
         network_role_tag:
-          get_input: port_1b_t2_port_network_role_tag
+          get_input: port_b_single_1b_t1_port_0_network_role_tag
         mac_requirements:
-          get_input: port_1b_t2_port_mac_requirements
+          get_input: port_b_single_1b_t1_port_0_mac_requirements
         order:
-          get_input: port_1b_t2_port_order
+          get_input: port_b_single_1b_t1_port_0_order
         network_role:
-          get_input: port_1b_t2_port_network_role
+          get_input: port_b_single_1b_t1_port_0_network_role
         subnetpoolid:
-          get_input: port_1b_t2_port_subnetpoolid
+          get_input: port_b_single_1b_t1_port_0_subnetpoolid
         network:
           get_input:
-          - port_1b_t2_port_network
+          - port_b_single_1b_t1_port_0_network
           - index_value
       requirements:
       - binding:
@@ -213,21 +213,15 @@ topology_template:
         get_attribute:
         - b_single_1b
         - instance_name
-    b_single_1b_1b_t1_port_tenant_id:
+    b_single_1b_b_single_1b_t1_port_0_tenant_id:
       type: string
       value:
         get_attribute:
-        - b_single_1b_1b_t1_port
+        - b_single_1b_b_single_1b_t1_port_0
         - tenant_id
   substitution_mappings:
     node_type: org.openecomp.resource.abstract.nodes.b_single_1b_1
     capabilities:
-      attachment_b_single_1b_1b_t2_port:
-      - b_single_1b_1b_t2_port
-      - attachment
-      forwarder_b_single_1b_1b_t2_port:
-      - b_single_1b_1b_t2_port
-      - forwarder
       endpoint_b_single_1b:
       - b_single_1b
       - endpoint
@@ -237,15 +231,30 @@ topology_template:
       disk.iops_b_single_1b:
       - b_single_1b
       - disk.iops
-      network.incoming.bytes.rate_b_single_1b_1b_t2_port:
-      - b_single_1b_1b_t2_port
+      network.incoming.bytes_b_single_1b_b_single_1b_t1_port_0:
+      - b_single_1b_b_single_1b_t1_port_0
+      - network.incoming.bytes
+      network.incoming.packets.rate_b_single_1b_b_single_1b_t2_port_0:
+      - b_single_1b_b_single_1b_t2_port_0
+      - network.incoming.packets.rate
+      network.incoming.bytes_b_single_1b_b_single_1b_t2_port_0:
+      - b_single_1b_b_single_1b_t2_port_0
+      - network.incoming.bytes
+      binding_b_single_1b_b_single_1b_t1_port_0:
+      - b_single_1b_b_single_1b_t1_port_0
+      - binding
+      feature_b_single_1b_b_single_1b_t2_port_0:
+      - b_single_1b_b_single_1b_t2_port_0
+      - feature
+      feature_b_single_1b_b_single_1b_t1_port_0:
+      - b_single_1b_b_single_1b_t1_port_0
+      - feature
+      network.incoming.bytes.rate_b_single_1b_b_single_1b_t1_port_0:
+      - b_single_1b_b_single_1b_t1_port_0
       - network.incoming.bytes.rate
-      network.outgoing.bytes.rate_b_single_1b_1b_t2_port:
-      - b_single_1b_1b_t2_port
-      - network.outgoing.bytes.rate
-      forwarder_b_single_1b_1b_t1_port:
-      - b_single_1b_1b_t1_port
-      - forwarder
+      binding_b_single_1b_b_single_1b_t2_port_0:
+      - b_single_1b_b_single_1b_t2_port_0
+      - binding
       scalable_b_single_1b:
       - b_single_1b
       - scalable
@@ -255,24 +264,30 @@ topology_template:
       os_b_single_1b:
       - b_single_1b
       - os
+      forwarder_b_single_1b_b_single_1b_t2_port_0:
+      - b_single_1b_b_single_1b_t2_port_0
+      - forwarder
+      forwarder_b_single_1b_b_single_1b_t1_port_0:
+      - b_single_1b_b_single_1b_t1_port_0
+      - forwarder
       vcpus_b_single_1b:
       - b_single_1b
       - vcpus
       cpu_b_single_1b:
       - b_single_1b
       - cpu
+      network.incoming.bytes.rate_b_single_1b_b_single_1b_t2_port_0:
+      - b_single_1b_b_single_1b_t2_port_0
+      - network.incoming.bytes.rate
       disk.device.read.requests.rate_b_single_1b:
       - b_single_1b
       - disk.device.read.requests.rate
-      network.incoming.packets.rate_b_single_1b_1b_t2_port:
-      - b_single_1b_1b_t2_port
+      network.incoming.packets.rate_b_single_1b_b_single_1b_t1_port_0:
+      - b_single_1b_b_single_1b_t1_port_0
       - network.incoming.packets.rate
       instance_b_single_1b:
       - b_single_1b
       - instance
-      network.incoming.bytes.rate_b_single_1b_1b_t1_port:
-      - b_single_1b_1b_t1_port
-      - network.incoming.bytes.rate
       disk.read.bytes_b_single_1b:
       - b_single_1b
       - disk.read.bytes
@@ -282,45 +297,36 @@ topology_template:
       disk.usage_b_single_1b:
       - b_single_1b
       - disk.usage
-      network.incoming.bytes_b_single_1b_1b_t1_port:
-      - b_single_1b_1b_t1_port
-      - network.incoming.bytes
       disk.device.allocation_b_single_1b:
       - b_single_1b
       - disk.device.allocation
-      network.outgoing.packets.rate_b_single_1b_1b_t2_port:
-      - b_single_1b_1b_t2_port
+      network.outgoing.packets.rate_b_single_1b_b_single_1b_t2_port_0:
+      - b_single_1b_b_single_1b_t2_port_0
       - network.outgoing.packets.rate
+      network.outpoing.packets_b_single_1b_b_single_1b_t1_port_0:
+      - b_single_1b_b_single_1b_t1_port_0
+      - network.outpoing.packets
+      network.outgoing.bytes_b_single_1b_b_single_1b_t2_port_0:
+      - b_single_1b_b_single_1b_t2_port_0
+      - network.outgoing.bytes
       disk.device.capacity_b_single_1b:
       - b_single_1b
       - disk.device.capacity
       disk.latency_b_single_1b:
       - b_single_1b
       - disk.latency
-      network.incoming.packets_b_single_1b_1b_t2_port:
-      - b_single_1b_1b_t2_port
-      - network.incoming.packets
-      network.incoming.packets.rate_b_single_1b_1b_t1_port:
-      - b_single_1b_1b_t1_port
-      - network.incoming.packets.rate
-      attachment_b_single_1b_1b_t1_port:
-      - b_single_1b_1b_t1_port
+      attachment_b_single_1b_b_single_1b_t1_port_0:
+      - b_single_1b_b_single_1b_t1_port_0
       - attachment
       disk.device.write.requests_b_single_1b:
       - b_single_1b
       - disk.device.write.requests
-      binding_b_single_1b_1b_t2_port:
-      - b_single_1b_1b_t2_port
-      - binding
       disk.ephemeral.size_b_single_1b:
       - b_single_1b
       - disk.ephemeral.size
       disk.write.requests.rate_b_single_1b:
       - b_single_1b
       - disk.write.requests.rate
-      network.outpoing.packets_b_single_1b_1b_t2_port:
-      - b_single_1b_1b_t2_port
-      - network.outpoing.packets
       disk.device.iops_b_single_1b:
       - b_single_1b
       - disk.device.iops
@@ -330,15 +336,18 @@ topology_template:
       memory.resident_b_single_1b:
       - b_single_1b
       - memory.resident
+      network.outgoing.bytes.rate_b_single_1b_b_single_1b_t2_port_0:
+      - b_single_1b_b_single_1b_t2_port_0
+      - network.outgoing.bytes.rate
       disk.root.size_b_single_1b:
       - b_single_1b
       - disk.root.size
-      feature_b_single_1b_1b_t1_port:
-      - b_single_1b_1b_t1_port
-      - feature
-      network.outgoing.bytes_b_single_1b_1b_t2_port:
-      - b_single_1b_1b_t2_port
-      - network.outgoing.bytes
+      network.incoming.packets_b_single_1b_b_single_1b_t1_port_0:
+      - b_single_1b_b_single_1b_t1_port_0
+      - network.incoming.packets
+      network.outgoing.bytes.rate_b_single_1b_b_single_1b_t1_port_0:
+      - b_single_1b_b_single_1b_t1_port_0
+      - network.outgoing.bytes.rate
       disk.capacity_b_single_1b:
       - b_single_1b
       - disk.capacity
@@ -357,45 +366,39 @@ topology_template:
       disk.write.requests_b_single_1b:
       - b_single_1b
       - disk.write.requests
-      network.outgoing.packets.rate_b_single_1b_1b_t1_port:
-      - b_single_1b_1b_t1_port
-      - network.outgoing.packets.rate
+      network.incoming.packets_b_single_1b_b_single_1b_t2_port_0:
+      - b_single_1b_b_single_1b_t2_port_0
+      - network.incoming.packets
       disk.device.usage_b_single_1b:
       - b_single_1b
       - disk.device.usage
       disk.read.bytes.rate_b_single_1b:
       - b_single_1b
       - disk.read.bytes.rate
-      network.outgoing.bytes_b_single_1b_1b_t1_port:
-      - b_single_1b_1b_t1_port
-      - network.outgoing.bytes
       disk.device.read.requests_b_single_1b:
       - b_single_1b
       - disk.device.read.requests
-      network.incoming.packets_b_single_1b_1b_t1_port:
-      - b_single_1b_1b_t1_port
-      - network.incoming.packets
-      binding_b_single_1b_1b_t1_port:
-      - b_single_1b_1b_t1_port
-      - binding
-      network.outpoing.packets_b_single_1b_1b_t1_port:
-      - b_single_1b_1b_t1_port
-      - network.outpoing.packets
+      attachment_b_single_1b_b_single_1b_t2_port_0:
+      - b_single_1b_b_single_1b_t2_port_0
+      - attachment
       disk.device.write.requests.rate_b_single_1b:
       - b_single_1b
       - disk.device.write.requests.rate
+      network.outgoing.packets.rate_b_single_1b_b_single_1b_t1_port_0:
+      - b_single_1b_b_single_1b_t1_port_0
+      - network.outgoing.packets.rate
+      network.outpoing.packets_b_single_1b_b_single_1b_t2_port_0:
+      - b_single_1b_b_single_1b_t2_port_0
+      - network.outpoing.packets
       memory.usage_b_single_1b:
       - b_single_1b
       - memory.usage
+      network.outgoing.bytes_b_single_1b_b_single_1b_t1_port_0:
+      - b_single_1b_b_single_1b_t1_port_0
+      - network.outgoing.bytes
       disk.write.bytes.rate_b_single_1b:
       - b_single_1b
       - disk.write.bytes.rate
-      network.incoming.bytes_b_single_1b_1b_t2_port:
-      - b_single_1b_1b_t2_port
-      - network.incoming.bytes
-      network.outgoing.bytes.rate_b_single_1b_1b_t1_port:
-      - b_single_1b_1b_t1_port
-      - network.outgoing.bytes.rate
       cpu.delta_b_single_1b:
       - b_single_1b
       - cpu.delta
@@ -414,25 +417,22 @@ topology_template:
       binding_b_single_1b:
       - b_single_1b
       - binding
-      feature_b_single_1b_1b_t2_port:
-      - b_single_1b_1b_t2_port
-      - feature
     requirements:
       local_storage_b_single_1b:
       - b_single_1b
       - local_storage
-      dependency_b_single_1b_1b_t1_port:
-      - b_single_1b_1b_t1_port
-      - dependency
+      link_b_single_1b_b_single_1b_t1_port_0:
+      - b_single_1b_b_single_1b_t1_port_0
+      - link
       dependency_b_single_1b:
       - b_single_1b
       - dependency
-      link_b_single_1b_1b_t2_port:
-      - b_single_1b_1b_t2_port
-      - link
-      link_b_single_1b_1b_t1_port:
-      - b_single_1b_1b_t1_port
-      - link
-      dependency_b_single_1b_1b_t2_port:
-      - b_single_1b_1b_t2_port
-      - dependency
\ No newline at end of file
+      dependency_b_single_1b_b_single_1b_t2_port_0:
+      - b_single_1b_b_single_1b_t2_port_0
+      - dependency
+      dependency_b_single_1b_b_single_1b_t1_port_0:
+      - b_single_1b_b_single_1b_t1_port_0
+      - dependency
+      link_b_single_1b_b_single_1b_t2_port_0:
+      - b_single_1b_b_single_1b_t2_port_0
+      - link
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_pcma_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_pcma_serverServiceTemplate.yaml
index 3b3e7bc0ed..3397b00ba8 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_pcma_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_pcma_serverServiceTemplate.yaml
@@ -11,36 +11,40 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
-    port_pcm_port_3_mac_requirements:
-      type: org.openecomp.datatypes.network.MacRequirements
-      required: true
-    port_pcm_port_2_network_role:
+    port_pcm_port_2_0_subnetpoolid:
       type: string
       required: true
-    port_pcm_port_2_fixed_ips:
+    port_pcm_port_2_0_security_groups:
       type: list
       required: true
       entry_schema:
-        type: org.openecomp.datatypes.heat.neutron.port.FixedIps
-    port_pcm_port_3_network_role:
-      type: string
+        type: json
+    port_pcm_port_2_0_mac_requirements:
+      type: org.openecomp.datatypes.network.MacRequirements
       required: true
-    port_pcm_port_3_vlan_requirements:
+    port_pcm_port_2_0_vlan_requirements:
       type: list
       required: true
       entry_schema:
         type: org.openecomp.datatypes.network.VlanRequirements
+    port_pcm_port_3_0_fixed_ips:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.heat.neutron.port.FixedIps
     vm_flavor_name:
       type: string
       required: true
-    port_pcm_port_3_security_groups:
+    port_pcm_port_3_0_ip_requirements:
       type: list
       required: true
       entry_schema:
-        type: json
-    port_pcm_port_3_order:
-      type: integer
+        type: org.openecomp.datatypes.network.IpRequirements
+    port_pcm_port_3_0_related_networks:
+      type: list
       required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     compute_pcma_server_availability_zone:
       type: list
       required: true
@@ -49,51 +53,40 @@ topology_template:
     vm_image_name:
       type: string
       required: true
-    port_pcm_port_2_security_groups:
+    port_pcm_port_3_0_security_groups:
       type: list
       required: true
       entry_schema:
         type: json
-    port_pcm_port_2_exCP_naming:
+    port_pcm_port_2_0_exCP_naming:
       type: org.openecomp.datatypes.Naming
       required: true
-    port_pcm_port_3_ip_requirements:
+    port_pcm_port_2_0_network:
       type: list
       required: true
       entry_schema:
-        type: org.openecomp.datatypes.network.IpRequirements
-    port_pcm_port_2_subnetpoolid:
-      type: string
-      required: true
-    port_pcm_port_2_mac_requirements:
-      type: org.openecomp.datatypes.network.MacRequirements
-      required: true
-    port_pcm_port_2_vlan_requirements:
-      type: list
-      required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.VlanRequirements
-    port_pcm_port_3_subnetpoolid:
+        type: string
+    port_pcm_port_2_0_network_role_tag:
       type: string
       required: true
-    port_pcm_port_3_network_role_tag:
+    port_pcm_port_3_0_network_role_tag:
       type: string
       required: true
-    compute_pcma_server_config_drive:
+    port_pcm_port_3_0_vlan_requirements:
       type: list
       required: true
       entry_schema:
-        type: boolean
-    port_pcm_port_3_fixed_ips:
+        type: org.openecomp.datatypes.network.VlanRequirements
+    port_pcm_port_2_0_ip_requirements:
       type: list
       required: true
       entry_schema:
-        type: org.openecomp.datatypes.heat.neutron.port.FixedIps
-    port_pcm_port_3_related_networks:
+        type: org.openecomp.datatypes.network.IpRequirements
+    compute_pcma_server_config_drive:
       type: list
       required: true
       entry_schema:
-        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+        type: boolean
     index_value:
       type: integer
       description: Index value of this substitution service template runtime instance
@@ -106,35 +99,36 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    port_pcm_port_2_order:
-      type: integer
-      required: true
-    port_pcm_port_3_exCP_naming:
-      type: org.openecomp.datatypes.Naming
-      required: true
-    port_pcm_port_2_network:
+    port_pcm_port_3_0_network:
       type: list
       required: true
       entry_schema:
         type: string
-    port_pcm_port_2_ip_requirements:
-      type: list
-      required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.IpRequirements
-    port_pcm_port_2_network_role_tag:
+    port_pcm_port_2_0_network_role:
       type: string
       required: true
-    port_pcm_port_2_related_networks:
+    port_pcm_port_2_0_related_networks:
       type: list
       required: true
       entry_schema:
         type: org.openecomp.datatypes.network.RelatedNetworksAssignments
-    port_pcm_port_3_network:
+    port_pcm_port_2_0_fixed_ips:
       type: list
       required: true
       entry_schema:
-        type: string
+        type: org.openecomp.datatypes.heat.neutron.port.FixedIps
+    port_pcm_port_2_0_order:
+      type: integer
+      required: true
+    port_pcm_port_3_0_exCP_naming:
+      type: org.openecomp.datatypes.Naming
+      required: true
+    port_pcm_port_3_0_subnetpoolid:
+      type: string
+      required: true
+    port_pcm_port_3_0_mac_requirements:
+      type: org.openecomp.datatypes.network.MacRequirements
+      required: true
     compute_pcma_server_scheduler_hints:
       type: list
       required: true
@@ -145,6 +139,12 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_pcm_port_3_0_network_role:
+      type: string
+      required: true
+    port_pcm_port_3_0_order:
+      type: integer
+      required: true
   node_templates:
     pcma_server:
       type: org.openecomp.resource.vfc.compute.nodes.heat.pcma_server
@@ -173,78 +173,78 @@ topology_template:
           get_input:
           - compute_pcma_server_user_data_format
           - index_value
-    pcma_server_pcm_port_3:
+    pcma_server_pcm_port_2_0:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         mac_requirements:
-          get_input: port_pcm_port_3_mac_requirements
+          get_input: port_pcm_port_2_0_mac_requirements
         order:
-          get_input: port_pcm_port_3_order
+          get_input: port_pcm_port_2_0_order
         security_groups:
           get_input:
-          - port_pcm_port_3_security_groups
+          - port_pcm_port_2_0_security_groups
           - index_value
         exCP_naming:
-          get_input: port_pcm_port_3_exCP_naming
+          get_input: port_pcm_port_2_0_exCP_naming
         vlan_requirements:
-          get_input: port_pcm_port_3_vlan_requirements
+          get_input: port_pcm_port_2_0_vlan_requirements
         subinterface_indicator: false
         ip_requirements:
-          get_input: port_pcm_port_3_ip_requirements
+          get_input: port_pcm_port_2_0_ip_requirements
         related_networks:
-          get_input: port_pcm_port_3_related_networks
+          get_input: port_pcm_port_2_0_related_networks
         network_role_tag:
-          get_input: port_pcm_port_3_network_role_tag
+          get_input: port_pcm_port_2_0_network_role_tag
         network_role:
-          get_input: port_pcm_port_3_network_role
+          get_input: port_pcm_port_2_0_network_role
         fixed_ips:
           get_input:
-          - port_pcm_port_3_fixed_ips
+          - port_pcm_port_2_0_fixed_ips
           - index_value
         subnetpoolid:
-          get_input: port_pcm_port_3_subnetpoolid
+          get_input: port_pcm_port_2_0_subnetpoolid
         network:
           get_input:
-          - port_pcm_port_3_network
+          - port_pcm_port_2_0_network
           - index_value
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
           node: pcma_server
           relationship: tosca.relationships.network.BindsTo
-    pcma_server_pcm_port_2:
+    pcma_server_pcm_port_3_0:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         mac_requirements:
-          get_input: port_pcm_port_2_mac_requirements
+          get_input: port_pcm_port_3_0_mac_requirements
         order:
-          get_input: port_pcm_port_2_order
+          get_input: port_pcm_port_3_0_order
         security_groups:
           get_input:
-          - port_pcm_port_2_security_groups
+          - port_pcm_port_3_0_security_groups
           - index_value
         exCP_naming:
-          get_input: port_pcm_port_2_exCP_naming
+          get_input: port_pcm_port_3_0_exCP_naming
         vlan_requirements:
-          get_input: port_pcm_port_2_vlan_requirements
+          get_input: port_pcm_port_3_0_vlan_requirements
         subinterface_indicator: false
         ip_requirements:
-          get_input: port_pcm_port_2_ip_requirements
+          get_input: port_pcm_port_3_0_ip_requirements
         related_networks:
-          get_input: port_pcm_port_2_related_networks
+          get_input: port_pcm_port_3_0_related_networks
         network_role_tag:
-          get_input: port_pcm_port_2_network_role_tag
+          get_input: port_pcm_port_3_0_network_role_tag
         network_role:
-          get_input: port_pcm_port_2_network_role
+          get_input: port_pcm_port_3_0_network_role
         fixed_ips:
           get_input:
-          - port_pcm_port_2_fixed_ips
+          - port_pcm_port_3_0_fixed_ips
           - index_value
         subnetpoolid:
-          get_input: port_pcm_port_2_subnetpoolid
+          get_input: port_pcm_port_3_0_subnetpoolid
         network:
           get_input:
-          - port_pcm_port_2_network
+          - port_pcm_port_3_0_network
           - index_value
       requirements:
       - binding:
@@ -257,6 +257,18 @@ topology_template:
       cpu.delta_pcma_server:
       - pcma_server
       - cpu.delta
+      network.incoming.packets_pcma_server_pcm_port_3_0:
+      - pcma_server_pcm_port_3_0
+      - network.incoming.packets
+      network.outgoing.packets.rate_pcma_server_pcm_port_2_0:
+      - pcma_server_pcm_port_2_0
+      - network.outgoing.packets.rate
+      network.incoming.bytes.rate_pcma_server_pcm_port_2_0:
+      - pcma_server_pcm_port_2_0
+      - network.incoming.bytes.rate
+      network.outgoing.bytes.rate_pcma_server_pcm_port_2_0:
+      - pcma_server_pcm_port_2_0
+      - network.outgoing.bytes.rate
       scalable_pcma_server:
       - pcma_server
       - scalable
@@ -269,99 +281,69 @@ topology_template:
       disk.device.read.requests.rate_pcma_server:
       - pcma_server
       - disk.device.read.requests.rate
+      network.outpoing.packets_pcma_server_pcm_port_2_0:
+      - pcma_server_pcm_port_2_0
+      - network.outpoing.packets
       disk.usage_pcma_server:
       - pcma_server
       - disk.usage
-      network.outgoing.bytes.rate_pcma_server_pcm_port_3:
-      - pcma_server_pcm_port_3
-      - network.outgoing.bytes.rate
       disk.read.bytes_pcma_server:
       - pcma_server
       - disk.read.bytes
       disk.iops_pcma_server:
       - pcma_server
       - disk.iops
-      network.outgoing.bytes.rate_pcma_server_pcm_port_2:
-      - pcma_server_pcm_port_2
-      - network.outgoing.bytes.rate
-      attachment_pcma_server_pcm_port_2:
-      - pcma_server_pcm_port_2
-      - attachment
       endpoint_pcma_server:
       - pcma_server
       - endpoint
       feature_pcma_server:
       - pcma_server
       - feature
-      attachment_pcma_server_pcm_port_3:
-      - pcma_server_pcm_port_3
-      - attachment
-      network.incoming.bytes.rate_pcma_server_pcm_port_2:
-      - pcma_server_pcm_port_2
-      - network.incoming.bytes.rate
+      binding_pcma_server_pcm_port_2_0:
+      - pcma_server_pcm_port_2_0
+      - binding
       memory.usage_pcma_server:
       - pcma_server
       - memory.usage
-      network.outgoing.bytes_pcma_server_pcm_port_3:
-      - pcma_server_pcm_port_3
+      network.outgoing.bytes_pcma_server_pcm_port_2_0:
+      - pcma_server_pcm_port_2_0
       - network.outgoing.bytes
-      binding_pcma_server_pcm_port_3:
-      - pcma_server_pcm_port_3
-      - binding
-      network.incoming.bytes.rate_pcma_server_pcm_port_3:
-      - pcma_server_pcm_port_3
-      - network.incoming.bytes.rate
+      feature_pcma_server_pcm_port_3_0:
+      - pcma_server_pcm_port_3_0
+      - feature
       memory_pcma_server:
       - pcma_server
       - memory
-      network.outgoing.bytes_pcma_server_pcm_port_2:
-      - pcma_server_pcm_port_2
-      - network.outgoing.bytes
+      forwarder_pcma_server_pcm_port_3_0:
+      - pcma_server_pcm_port_3_0
+      - forwarder
       cpu_pcma_server:
       - pcma_server
       - cpu
       disk.device.write.bytes.rate_pcma_server:
       - pcma_server
       - disk.device.write.bytes.rate
+      network.incoming.packets.rate_pcma_server_pcm_port_3_0:
+      - pcma_server_pcm_port_3_0
+      - network.incoming.packets.rate
       disk.read.bytes.rate_pcma_server:
       - pcma_server
       - disk.read.bytes.rate
-      network.incoming.packets_pcma_server_pcm_port_3:
-      - pcma_server_pcm_port_3
-      - network.incoming.packets
-      binding_pcma_server_pcm_port_2:
-      - pcma_server_pcm_port_2
-      - binding
       os_pcma_server:
       - pcma_server
       - os
-      network.incoming.packets_pcma_server_pcm_port_2:
-      - pcma_server_pcm_port_2
-      - network.incoming.packets
-      network.incoming.packets.rate_pcma_server_pcm_port_3:
-      - pcma_server_pcm_port_3
-      - network.incoming.packets.rate
-      network.outgoing.packets.rate_pcma_server_pcm_port_3:
-      - pcma_server_pcm_port_3
-      - network.outgoing.packets.rate
-      network.incoming.packets.rate_pcma_server_pcm_port_2:
-      - pcma_server_pcm_port_2
-      - network.incoming.packets.rate
-      forwarder_pcma_server_pcm_port_2:
-      - pcma_server_pcm_port_2
-      - forwarder
+      network.incoming.bytes_pcma_server_pcm_port_3_0:
+      - pcma_server_pcm_port_3_0
+      - network.incoming.bytes
       disk.device.read.requests_pcma_server:
       - pcma_server
       - disk.device.read.requests
-      forwarder_pcma_server_pcm_port_3:
-      - pcma_server_pcm_port_3
-      - forwarder
+      attachment_pcma_server_pcm_port_3_0:
+      - pcma_server_pcm_port_3_0
+      - attachment
       disk.write.bytes.rate_pcma_server:
       - pcma_server
       - disk.write.bytes.rate
-      network.outgoing.packets.rate_pcma_server_pcm_port_2:
-      - pcma_server_pcm_port_2
-      - network.outgoing.packets.rate
       disk.device.write.requests.rate_pcma_server:
       - pcma_server
       - disk.device.write.requests.rate
@@ -383,12 +365,21 @@ topology_template:
       disk.allocation_pcma_server:
       - pcma_server
       - disk.allocation
-      feature_pcma_server_pcm_port_2:
-      - pcma_server_pcm_port_2
-      - feature
-      feature_pcma_server_pcm_port_3:
-      - pcma_server_pcm_port_3
-      - feature
+      network.outgoing.packets.rate_pcma_server_pcm_port_3_0:
+      - pcma_server_pcm_port_3_0
+      - network.outgoing.packets.rate
+      network.incoming.bytes.rate_pcma_server_pcm_port_3_0:
+      - pcma_server_pcm_port_3_0
+      - network.incoming.bytes.rate
+      network.incoming.packets_pcma_server_pcm_port_2_0:
+      - pcma_server_pcm_port_2_0
+      - network.incoming.packets
+      network.outgoing.bytes.rate_pcma_server_pcm_port_3_0:
+      - pcma_server_pcm_port_3_0
+      - network.outgoing.bytes.rate
+      network.outpoing.packets_pcma_server_pcm_port_3_0:
+      - pcma_server_pcm_port_3_0
+      - network.outpoing.packets
       disk.ephemeral.size_pcma_server:
       - pcma_server
       - disk.ephemeral.size
@@ -413,36 +404,45 @@ topology_template:
       disk.root.size_pcma_server:
       - pcma_server
       - disk.root.size
+      forwarder_pcma_server_pcm_port_2_0:
+      - pcma_server_pcm_port_2_0
+      - forwarder
+      binding_pcma_server_pcm_port_3_0:
+      - pcma_server_pcm_port_3_0
+      - binding
       disk.write.bytes_pcma_server:
       - pcma_server
       - disk.write.bytes
+      network.outgoing.bytes_pcma_server_pcm_port_3_0:
+      - pcma_server_pcm_port_3_0
+      - network.outgoing.bytes
       disk.write.requests_pcma_server:
       - pcma_server
       - disk.write.requests
-      network.incoming.bytes_pcma_server_pcm_port_2:
-      - pcma_server_pcm_port_2
-      - network.incoming.bytes
-      network.incoming.bytes_pcma_server_pcm_port_3:
-      - pcma_server_pcm_port_3
-      - network.incoming.bytes
+      feature_pcma_server_pcm_port_2_0:
+      - pcma_server_pcm_port_2_0
+      - feature
+      network.incoming.packets.rate_pcma_server_pcm_port_2_0:
+      - pcma_server_pcm_port_2_0
+      - network.incoming.packets.rate
       disk.write.requests.rate_pcma_server:
       - pcma_server
       - disk.write.requests.rate
+      network.incoming.bytes_pcma_server_pcm_port_2_0:
+      - pcma_server_pcm_port_2_0
+      - network.incoming.bytes
       disk.device.iops_pcma_server:
       - pcma_server
       - disk.device.iops
       instance_pcma_server:
       - pcma_server
       - instance
-      network.outpoing.packets_pcma_server_pcm_port_3:
-      - pcma_server_pcm_port_3
-      - network.outpoing.packets
+      attachment_pcma_server_pcm_port_2_0:
+      - pcma_server_pcm_port_2_0
+      - attachment
       disk.device.latency_pcma_server:
       - pcma_server
       - disk.device.latency
-      network.outpoing.packets_pcma_server_pcm_port_2:
-      - pcma_server_pcm_port_2
-      - network.outpoing.packets
       disk.capacity_pcma_server:
       - pcma_server
       - disk.capacity
@@ -450,21 +450,21 @@ topology_template:
       - pcma_server
       - disk.device.capacity
     requirements:
-      dependency_pcma_server_pcm_port_3:
-      - pcma_server_pcm_port_3
-      - dependency
       dependency_pcma_server:
       - pcma_server
       - dependency
-      dependency_pcma_server_pcm_port_2:
-      - pcma_server_pcm_port_2
-      - dependency
       local_storage_pcma_server:
       - pcma_server
       - local_storage
-      link_pcma_server_pcm_port_2:
-      - pcma_server_pcm_port_2
+      link_pcma_server_pcm_port_2_0:
+      - pcma_server_pcm_port_2_0
+      - link
+      link_pcma_server_pcm_port_3_0:
+      - pcma_server_pcm_port_3_0
       - link
-      link_pcma_server_pcm_port_3:
-      - pcma_server_pcm_port_3
-      - link
\ No newline at end of file
+      dependency_pcma_server_pcm_port_2_0:
+      - pcma_server_pcm_port_2_0
+      - dependency
+      dependency_pcma_server_pcm_port_3_0:
+      - pcma_server_pcm_port_3_0
+      - dependency
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_pcma_server_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_pcma_server_1ServiceTemplate.yaml
index 25ffdd165b..7ecb793c39 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_pcma_server_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_pcma_server_1ServiceTemplate.yaml
@@ -11,84 +11,67 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
-    port_pcm_port_1_related_networks:
-      type: list
+    port_pcm_port_0_0_mac_requirements:
+      type: org.openecomp.datatypes.network.MacRequirements
       required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
-    port_pcm_port_0_network_role:
-      type: string
+    port_pcm_port_1_0_mac_requirements:
+      type: org.openecomp.datatypes.network.MacRequirements
+      required: true
+    port_pcm_port_1_0_order:
+      type: integer
       required: true
-    port_pcm_port_1_network_role_tag:
+    vm_flavor_name:
       type: string
       required: true
-    port_pcm_port_0_fixed_ips:
+    port_pcm_port_0_0_order:
+      type: integer
+      required: true
+    compute_pcma_server_availability_zone:
       type: list
       required: true
       entry_schema:
-        type: org.openecomp.datatypes.heat.neutron.port.FixedIps
-    port_pcm_port_0_vlan_requirements:
+        type: string
+    port_pcm_port_0_0_security_groups:
       type: list
       required: true
       entry_schema:
-        type: org.openecomp.datatypes.network.VlanRequirements
-    vm_flavor_name:
-      type: string
-      required: true
-    port_pcm_port_0_security_groups:
+        type: json
+    port_pcm_port_1_0_vlan_requirements:
       type: list
       required: true
       entry_schema:
-        type: json
-    compute_pcma_server_availability_zone:
+        type: org.openecomp.datatypes.network.VlanRequirements
+    port_pcm_port_0_0_network:
       type: list
       required: true
       entry_schema:
         type: string
-    port_pcm_port_0_order:
-      type: integer
-      required: true
-    port_pcm_port_0_subnetpoolid:
-      type: string
-      required: true
     vm_image_name:
       type: string
       required: true
-    port_pcm_port_0_related_networks:
-      type: list
-      required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
-    port_pcm_port_1_subnetpoolid:
+    port_pcm_port_1_0_subnetpoolid:
       type: string
       required: true
-    port_pcm_port_0_network_role_tag:
+    port_pcm_port_0_0_network_role_tag:
       type: string
       required: true
-    port_pcm_port_1_exCP_naming:
-      type: org.openecomp.datatypes.Naming
+    port_pcm_port_1_0_ip_requirements:
+      type: list
       required: true
-    port_pcm_port_0_exCP_naming:
+      entry_schema:
+        type: org.openecomp.datatypes.network.IpRequirements
+    port_pcm_port_0_0_exCP_naming:
       type: org.openecomp.datatypes.Naming
       required: true
-    port_pcm_port_1_network_role:
+    port_pcm_port_1_0_network_role_tag:
       type: string
       required: true
-    port_pcm_port_1_network:
-      type: list
-      required: true
-      entry_schema:
-        type: string
-    port_pcm_port_1_security_groups:
-      type: list
+    port_pcm_port_1_0_network_role:
+      type: string
       required: true
-      entry_schema:
-        type: json
-    port_pcm_port_0_ip_requirements:
-      type: list
+    port_pcm_port_1_0_exCP_naming:
+      type: org.openecomp.datatypes.Naming
       required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.IpRequirements
     compute_pcma_server_config_drive:
       type: list
       required: true
@@ -106,40 +89,57 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    port_pcm_port_0_network:
+    port_pcm_port_0_0_related_networks:
       type: list
       required: true
       entry_schema:
-        type: string
-    port_pcm_port_1_mac_requirements:
-      type: org.openecomp.datatypes.network.MacRequirements
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+    port_pcm_port_0_0_subnetpoolid:
+      type: string
       required: true
-    port_pcm_port_1_vlan_requirements:
+    port_pcm_port_0_0_network_role:
+      type: string
+      required: true
+    port_pcm_port_1_0_related_networks:
       type: list
       required: true
       entry_schema:
-        type: org.openecomp.datatypes.network.VlanRequirements
-    port_pcm_port_1_fixed_ips:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+    port_pcm_port_0_0_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.IpRequirements
+    port_pcm_port_1_0_security_groups:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_pcm_port_0_0_fixed_ips:
       type: list
       required: true
       entry_schema:
         type: org.openecomp.datatypes.heat.neutron.port.FixedIps
-    compute_pcma_server_name:
+    port_pcm_port_1_0_fixed_ips:
       type: list
       required: true
       entry_schema:
-        type: string
-    port_pcm_port_1_ip_requirements:
+        type: org.openecomp.datatypes.heat.neutron.port.FixedIps
+    port_pcm_port_0_0_vlan_requirements:
       type: list
       required: true
       entry_schema:
-        type: org.openecomp.datatypes.network.IpRequirements
-    port_pcm_port_0_mac_requirements:
-      type: org.openecomp.datatypes.network.MacRequirements
+        type: org.openecomp.datatypes.network.VlanRequirements
+    compute_pcma_server_name:
+      type: list
       required: true
-    port_pcm_port_1_order:
-      type: integer
+      entry_schema:
+        type: string
+    port_pcm_port_1_0_network:
+      type: list
       required: true
+      entry_schema:
+        type: string
   node_templates:
     pcma_server:
       type: org.openecomp.resource.vfc.compute.nodes.heat.pcma_server
@@ -164,78 +164,78 @@ topology_template:
           get_input:
           - compute_pcma_server_user_data_format
           - index_value
-    pcma_server_pcm_port_0:
+    pcma_server_pcm_port_0_0:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         mac_requirements:
-          get_input: port_pcm_port_0_mac_requirements
+          get_input: port_pcm_port_0_0_mac_requirements
         order:
-          get_input: port_pcm_port_0_order
+          get_input: port_pcm_port_0_0_order
         security_groups:
           get_input:
-          - port_pcm_port_0_security_groups
+          - port_pcm_port_0_0_security_groups
           - index_value
         exCP_naming:
-          get_input: port_pcm_port_0_exCP_naming
+          get_input: port_pcm_port_0_0_exCP_naming
         vlan_requirements:
-          get_input: port_pcm_port_0_vlan_requirements
+          get_input: port_pcm_port_0_0_vlan_requirements
         subinterface_indicator: false
         ip_requirements:
-          get_input: port_pcm_port_0_ip_requirements
+          get_input: port_pcm_port_0_0_ip_requirements
         related_networks:
-          get_input: port_pcm_port_0_related_networks
+          get_input: port_pcm_port_0_0_related_networks
         network_role_tag:
-          get_input: port_pcm_port_0_network_role_tag
+          get_input: port_pcm_port_0_0_network_role_tag
         network_role:
-          get_input: port_pcm_port_0_network_role
+          get_input: port_pcm_port_0_0_network_role
         fixed_ips:
           get_input:
-          - port_pcm_port_0_fixed_ips
+          - port_pcm_port_0_0_fixed_ips
           - index_value
         subnetpoolid:
-          get_input: port_pcm_port_0_subnetpoolid
+          get_input: port_pcm_port_0_0_subnetpoolid
         network:
           get_input:
-          - port_pcm_port_0_network
+          - port_pcm_port_0_0_network
           - index_value
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
           node: pcma_server
           relationship: tosca.relationships.network.BindsTo
-    pcma_server_pcm_port_1:
+    pcma_server_pcm_port_1_0:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         mac_requirements:
-          get_input: port_pcm_port_1_mac_requirements
+          get_input: port_pcm_port_1_0_mac_requirements
         order:
-          get_input: port_pcm_port_1_order
+          get_input: port_pcm_port_1_0_order
         security_groups:
           get_input:
-          - port_pcm_port_1_security_groups
+          - port_pcm_port_1_0_security_groups
           - index_value
         exCP_naming:
-          get_input: port_pcm_port_1_exCP_naming
+          get_input: port_pcm_port_1_0_exCP_naming
         vlan_requirements:
-          get_input: port_pcm_port_1_vlan_requirements
+          get_input: port_pcm_port_1_0_vlan_requirements
         subinterface_indicator: false
         ip_requirements:
-          get_input: port_pcm_port_1_ip_requirements
+          get_input: port_pcm_port_1_0_ip_requirements
         related_networks:
-          get_input: port_pcm_port_1_related_networks
+          get_input: port_pcm_port_1_0_related_networks
         network_role_tag:
-          get_input: port_pcm_port_1_network_role_tag
+          get_input: port_pcm_port_1_0_network_role_tag
         network_role:
-          get_input: port_pcm_port_1_network_role
+          get_input: port_pcm_port_1_0_network_role
         fixed_ips:
           get_input:
-          - port_pcm_port_1_fixed_ips
+          - port_pcm_port_1_0_fixed_ips
           - index_value
         subnetpoolid:
-          get_input: port_pcm_port_1_subnetpoolid
+          get_input: port_pcm_port_1_0_subnetpoolid
         network:
           get_input:
-          - port_pcm_port_1_network
+          - port_pcm_port_1_0_network
           - index_value
       requirements:
       - binding:
@@ -248,39 +248,42 @@ topology_template:
       cpu.delta_pcma_server:
       - pcma_server
       - cpu.delta
+      network.incoming.bytes.rate_pcma_server_pcm_port_0_0:
+      - pcma_server_pcm_port_0_0
+      - network.incoming.bytes.rate
+      network.incoming.packets_pcma_server_pcm_port_1_0:
+      - pcma_server_pcm_port_1_0
+      - network.incoming.packets
       scalable_pcma_server:
       - pcma_server
       - scalable
       vcpus_pcma_server:
       - pcma_server
       - vcpus
+      network.outgoing.bytes.rate_pcma_server_pcm_port_0_0:
+      - pcma_server_pcm_port_0_0
+      - network.outgoing.bytes.rate
       host_pcma_server:
       - pcma_server
       - host
       disk.device.read.requests.rate_pcma_server:
       - pcma_server
       - disk.device.read.requests.rate
+      network.outgoing.packets.rate_pcma_server_pcm_port_0_0:
+      - pcma_server_pcm_port_0_0
+      - network.outgoing.packets.rate
+      network.outpoing.packets_pcma_server_pcm_port_0_0:
+      - pcma_server_pcm_port_0_0
+      - network.outpoing.packets
       disk.usage_pcma_server:
       - pcma_server
       - disk.usage
-      attachment_pcma_server_pcm_port_0:
-      - pcma_server_pcm_port_0
-      - attachment
       disk.read.bytes_pcma_server:
       - pcma_server
       - disk.read.bytes
       disk.iops_pcma_server:
       - pcma_server
       - disk.iops
-      network.outgoing.bytes.rate_pcma_server_pcm_port_0:
-      - pcma_server_pcm_port_0
-      - network.outgoing.bytes.rate
-      network.outgoing.bytes.rate_pcma_server_pcm_port_1:
-      - pcma_server_pcm_port_1
-      - network.outgoing.bytes.rate
-      attachment_pcma_server_pcm_port_1:
-      - pcma_server_pcm_port_1
-      - attachment
       endpoint_pcma_server:
       - pcma_server
       - endpoint
@@ -290,21 +293,18 @@ topology_template:
       memory.usage_pcma_server:
       - pcma_server
       - memory.usage
-      network.incoming.packets_pcma_server_pcm_port_0:
-      - pcma_server_pcm_port_0
-      - network.incoming.packets
-      network.incoming.bytes.rate_pcma_server_pcm_port_1:
-      - pcma_server_pcm_port_1
-      - network.incoming.bytes.rate
-      network.outgoing.bytes_pcma_server_pcm_port_0:
-      - pcma_server_pcm_port_0
+      forwarder_pcma_server_pcm_port_1_0:
+      - pcma_server_pcm_port_1_0
+      - forwarder
+      network.outgoing.bytes_pcma_server_pcm_port_0_0:
+      - pcma_server_pcm_port_0_0
       - network.outgoing.bytes
       memory_pcma_server:
       - pcma_server
       - memory
-      network.outgoing.bytes_pcma_server_pcm_port_1:
-      - pcma_server_pcm_port_1
-      - network.outgoing.bytes
+      network.incoming.packets.rate_pcma_server_pcm_port_1_0:
+      - pcma_server_pcm_port_1_0
+      - network.incoming.packets.rate
       cpu_pcma_server:
       - pcma_server
       - cpu
@@ -314,48 +314,30 @@ topology_template:
       disk.read.bytes.rate_pcma_server:
       - pcma_server
       - disk.read.bytes.rate
-      network.incoming.packets.rate_pcma_server_pcm_port_0:
-      - pcma_server_pcm_port_0
-      - network.incoming.packets.rate
-      binding_pcma_server_pcm_port_0:
-      - pcma_server_pcm_port_0
+      feature_pcma_server_pcm_port_1_0:
+      - pcma_server_pcm_port_1_0
+      - feature
+      binding_pcma_server_pcm_port_0_0:
+      - pcma_server_pcm_port_0_0
       - binding
-      network.incoming.packets_pcma_server_pcm_port_1:
-      - pcma_server_pcm_port_1
-      - network.incoming.packets
       os_pcma_server:
       - pcma_server
       - os
-      binding_pcma_server_pcm_port_1:
-      - pcma_server_pcm_port_1
-      - binding
-      network.incoming.packets.rate_pcma_server_pcm_port_1:
-      - pcma_server_pcm_port_1
-      - network.incoming.packets.rate
-      forwarder_pcma_server_pcm_port_0:
-      - pcma_server_pcm_port_0
-      - forwarder
-      forwarder_pcma_server_pcm_port_1:
-      - pcma_server_pcm_port_1
-      - forwarder
+      network.incoming.bytes_pcma_server_pcm_port_1_0:
+      - pcma_server_pcm_port_1_0
+      - network.incoming.bytes
       disk.device.read.requests_pcma_server:
       - pcma_server
       - disk.device.read.requests
       disk.write.bytes.rate_pcma_server:
       - pcma_server
       - disk.write.bytes.rate
-      network.outgoing.packets.rate_pcma_server_pcm_port_1:
-      - pcma_server_pcm_port_1
-      - network.outgoing.packets.rate
+      attachment_pcma_server_pcm_port_1_0:
+      - pcma_server_pcm_port_1_0
+      - attachment
       disk.device.write.requests.rate_pcma_server:
       - pcma_server
       - disk.device.write.requests.rate
-      network.incoming.bytes.rate_pcma_server_pcm_port_0:
-      - pcma_server_pcm_port_0
-      - network.incoming.bytes.rate
-      network.outgoing.packets.rate_pcma_server_pcm_port_0:
-      - pcma_server_pcm_port_0
-      - network.outgoing.packets.rate
       cpu_util_pcma_server:
       - pcma_server
       - cpu_util
@@ -374,15 +356,24 @@ topology_template:
       disk.allocation_pcma_server:
       - pcma_server
       - disk.allocation
-      feature_pcma_server_pcm_port_0:
-      - pcma_server_pcm_port_0
-      - feature
-      feature_pcma_server_pcm_port_1:
-      - pcma_server_pcm_port_1
-      - feature
+      network.incoming.packets_pcma_server_pcm_port_0_0:
+      - pcma_server_pcm_port_0_0
+      - network.incoming.packets
+      network.incoming.bytes.rate_pcma_server_pcm_port_1_0:
+      - pcma_server_pcm_port_1_0
+      - network.incoming.bytes.rate
+      network.outgoing.bytes.rate_pcma_server_pcm_port_1_0:
+      - pcma_server_pcm_port_1_0
+      - network.outgoing.bytes.rate
+      network.outgoing.packets.rate_pcma_server_pcm_port_1_0:
+      - pcma_server_pcm_port_1_0
+      - network.outgoing.packets.rate
       disk.ephemeral.size_pcma_server:
       - pcma_server
       - disk.ephemeral.size
+      network.outpoing.packets_pcma_server_pcm_port_1_0:
+      - pcma_server_pcm_port_1_0
+      - network.outpoing.packets
       binding_pcma_server:
       - pcma_server
       - binding
@@ -407,21 +398,33 @@ topology_template:
       disk.write.bytes_pcma_server:
       - pcma_server
       - disk.write.bytes
-      network.incoming.bytes_pcma_server_pcm_port_0:
-      - pcma_server_pcm_port_0
-      - network.incoming.bytes
+      forwarder_pcma_server_pcm_port_0_0:
+      - pcma_server_pcm_port_0_0
+      - forwarder
+      network.outgoing.bytes_pcma_server_pcm_port_1_0:
+      - pcma_server_pcm_port_1_0
+      - network.outgoing.bytes
+      network.incoming.packets.rate_pcma_server_pcm_port_0_0:
+      - pcma_server_pcm_port_0_0
+      - network.incoming.packets.rate
+      feature_pcma_server_pcm_port_0_0:
+      - pcma_server_pcm_port_0_0
+      - feature
       disk.write.requests_pcma_server:
       - pcma_server
       - disk.write.requests
-      network.incoming.bytes_pcma_server_pcm_port_1:
-      - pcma_server_pcm_port_1
-      - network.incoming.bytes
+      binding_pcma_server_pcm_port_1_0:
+      - pcma_server_pcm_port_1_0
+      - binding
       disk.write.requests.rate_pcma_server:
       - pcma_server
       - disk.write.requests.rate
       disk.device.iops_pcma_server:
       - pcma_server
       - disk.device.iops
+      network.incoming.bytes_pcma_server_pcm_port_0_0:
+      - pcma_server_pcm_port_0_0
+      - network.incoming.bytes
       instance_pcma_server:
       - pcma_server
       - instance
@@ -434,28 +437,25 @@ topology_template:
       disk.device.capacity_pcma_server:
       - pcma_server
       - disk.device.capacity
-      network.outpoing.packets_pcma_server_pcm_port_1:
-      - pcma_server_pcm_port_1
-      - network.outpoing.packets
-      network.outpoing.packets_pcma_server_pcm_port_0:
-      - pcma_server_pcm_port_0
-      - network.outpoing.packets
+      attachment_pcma_server_pcm_port_0_0:
+      - pcma_server_pcm_port_0_0
+      - attachment
     requirements:
       dependency_pcma_server:
       - pcma_server
       - dependency
-      dependency_pcma_server_pcm_port_1:
-      - pcma_server_pcm_port_1
-      - dependency
       local_storage_pcma_server:
       - pcma_server
       - local_storage
-      link_pcma_server_pcm_port_0:
-      - pcma_server_pcm_port_0
+      link_pcma_server_pcm_port_0_0:
+      - pcma_server_pcm_port_0_0
       - link
-      link_pcma_server_pcm_port_1:
-      - pcma_server_pcm_port_1
+      link_pcma_server_pcm_port_1_0:
+      - pcma_server_pcm_port_1_0
       - link
-      dependency_pcma_server_pcm_port_0:
-      - pcma_server_pcm_port_0
+      dependency_pcma_server_pcm_port_0_0:
+      - pcma_server_pcm_port_0_0
+      - dependency
+      dependency_pcma_server_pcm_port_1_0:
+      - pcma_server_pcm_port_1_0
       - dependency
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/nested-no_vfc_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/nested-no_vfc_v0.1ServiceTemplate.yaml
index 96bccb85ef..77af97fb00 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/nested-no_vfc_v0.1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/nested-no_vfc_v0.1ServiceTemplate.yaml
@@ -108,52 +108,52 @@ topology_template:
       directives:
       - substitutable
       properties:
-        port_pcm_port_1_network_role_tag: oam
-        port_pcm_port_0_fixed_ips:
-        - ip_address:
-            get_input: cps_net_ip
+        port_pcm_port_0_0_mac_requirements:
+          mac_count_required:
+            is_required: false
+        port_pcm_port_1_0_mac_requirements:
+          mac_count_required:
+            is_required: false
         vm_flavor_name:
           get_input: pcma_flavor_name
-        port_pcm_port_0_security_groups:
-        - - get_input: security_group_name
         compute_pcma_server_availability_zone:
         - get_input: availabilityzone_name
+        port_pcm_port_0_0_security_groups:
+        - - get_input: security_group_name
+        port_pcm_port_0_0_network:
+        - get_input: cps_net_name
         vm_image_name:
           get_input: pcma_image_name
-        port_pcm_port_0_network_role_tag: cps
-        port_pcm_port_1_network:
-        - get_input: oam_net_name
-        port_pcm_port_1_security_groups:
-        - - get_input: security_group_name
-        port_pcm_port_0_ip_requirements:
+        port_pcm_port_0_0_network_role_tag: cps
+        port_pcm_port_1_0_ip_requirements:
         - ip_version: 4
           ip_count_required:
             is_required: true
           floating_ip_count_required:
             is_required: false
+        port_pcm_port_1_0_network_role_tag: oam
         compute_pcma_server_config_drive:
         - true
         compute_pcma_server_user_data_format:
         - RAW
-        port_pcm_port_0_network:
-        - get_input: cps_net_name
-        port_pcm_port_1_mac_requirements:
-          mac_count_required:
-            is_required: false
-        port_pcm_port_1_fixed_ips:
-        - ip_address:
-            get_input: oam_net_ip
-        compute_pcma_server_name:
-        - get_input: pcma_server_name
-        port_pcm_port_1_ip_requirements:
+        port_pcm_port_0_0_ip_requirements:
         - ip_version: 4
           ip_count_required:
             is_required: true
           floating_ip_count_required:
             is_required: false
-        port_pcm_port_0_mac_requirements:
-          mac_count_required:
-            is_required: false
+        port_pcm_port_1_0_security_groups:
+        - - get_input: security_group_name
+        port_pcm_port_0_0_fixed_ips:
+        - ip_address:
+            get_input: cps_net_ip
+        port_pcm_port_1_0_fixed_ips:
+        - ip_address:
+            get_input: oam_net_ip
+        compute_pcma_server_name:
+        - get_input: pcma_server_name
+        port_pcm_port_1_0_network:
+        - get_input: oam_net_name
         service_template_filter:
           substitute_service_template: Nested_pcma_server_1ServiceTemplate.yaml
           count: 1
@@ -167,50 +167,50 @@ topology_template:
       directives:
       - substitutable
       properties:
-        port_pcm_port_3_mac_requirements:
+        port_pcm_port_2_0_security_groups:
+        - - get_input: security_group_name
+        port_pcm_port_2_0_mac_requirements:
           mac_count_required:
             is_required: false
-        port_pcm_port_2_fixed_ips:
+        port_pcm_port_3_0_fixed_ips:
         - ip_address:
-            get_input: cps_net_ip
+            get_input: oam_net_ip
         vm_flavor_name:
           get_input: pcma_flavor_name
-        port_pcm_port_3_security_groups:
-        - - get_input: security_group_name
+        port_pcm_port_3_0_ip_requirements:
+        - ip_version: 4
+          ip_count_required:
+            is_required: true
+          floating_ip_count_required:
+            is_required: false
         compute_pcma_server_availability_zone:
         - get_input: availabilityzone_name
         vm_image_name:
           get_input: pcma_image_name
-        port_pcm_port_2_security_groups:
+        port_pcm_port_3_0_security_groups:
         - - get_input: security_group_name
-        port_pcm_port_3_ip_requirements:
+        port_pcm_port_2_0_network:
+        - get_input: cps_net_name
+        port_pcm_port_2_0_network_role_tag: cps
+        port_pcm_port_3_0_network_role_tag: oam
+        port_pcm_port_2_0_ip_requirements:
         - ip_version: 4
           ip_count_required:
             is_required: true
           floating_ip_count_required:
             is_required: false
-        port_pcm_port_2_mac_requirements:
-          mac_count_required:
-            is_required: false
-        port_pcm_port_3_network_role_tag: oam
         compute_pcma_server_config_drive:
         - true
-        port_pcm_port_3_fixed_ips:
-        - ip_address:
-            get_input: oam_net_ip
         compute_pcma_server_user_data_format:
         - RAW
-        port_pcm_port_2_network:
-        - get_input: cps_net_name
-        port_pcm_port_2_ip_requirements:
-        - ip_version: 4
-          ip_count_required:
-            is_required: true
-          floating_ip_count_required:
-            is_required: false
-        port_pcm_port_2_network_role_tag: cps
-        port_pcm_port_3_network:
+        port_pcm_port_3_0_network:
         - get_input: oam_net_name
+        port_pcm_port_2_0_fixed_ips:
+        - ip_address:
+            get_input: cps_net_ip
+        port_pcm_port_3_0_mac_requirements:
+          mac_count_required:
+            is_required: false
         compute_pcma_server_scheduler_hints:
         - group:
             get_input: server_group
@@ -241,19 +241,19 @@ topology_template:
     capabilities:
       network.outpoing.packets_pcm_port_2_0:
       - abstract_pcma_server
-      - network.outpoing.packets_pcma_server_pcm_port_2
+      - network.outpoing.packets_pcma_server_pcm_port_2_0
       disk.device.iops_server_pcma2:
       - abstract_pcma_server
       - disk.device.iops_pcma_server
       network.outgoing.bytes.rate_pcm_port_1_0:
       - abstract_pcma_server_1
-      - network.outgoing.bytes.rate_pcma_server_pcm_port_1
+      - network.outgoing.bytes.rate_pcma_server_pcm_port_1_0
       disk.device.iops_server_pcma1:
       - abstract_pcma_server_1
       - disk.device.iops_pcma_server
       network.incoming.bytes.rate_pcm_port_0_0:
       - abstract_pcma_server_1
-      - network.incoming.bytes.rate_pcma_server_pcm_port_0
+      - network.incoming.bytes.rate_pcma_server_pcm_port_0_0
       disk.device.capacity_server_pcma2:
       - abstract_pcma_server
       - disk.device.capacity_pcma_server
@@ -271,10 +271,10 @@ topology_template:
       - disk.write.requests.rate_pcma_server
       network.incoming.packets_pcm_port_1_0:
       - abstract_pcma_server_1
-      - network.incoming.packets_pcma_server_pcm_port_1
+      - network.incoming.packets_pcma_server_pcm_port_1_0
       network.incoming.bytes_pcm_port_0_0:
       - abstract_pcma_server_1
-      - network.incoming.bytes_pcma_server_pcm_port_0
+      - network.incoming.bytes_pcma_server_pcm_port_0_0
       disk.write.requests.rate_server_pcma2:
       - abstract_pcma_server
       - disk.write.requests.rate_pcma_server
@@ -289,13 +289,13 @@ topology_template:
       - disk.device.read.bytes.rate_pcma_server
       feature_pcm_port_0_0:
       - abstract_pcma_server_1
-      - feature_pcma_server_pcm_port_0
+      - feature_pcma_server_pcm_port_0_0
       disk.device.read.bytes.rate_server_pcma2:
       - abstract_pcma_server
       - disk.device.read.bytes.rate_pcma_server
       forwarder_pcm_port_0_0:
       - abstract_pcma_server_1
-      - forwarder_pcma_server_pcm_port_0
+      - forwarder_pcma_server_pcm_port_0_0
       disk.device.latency_server_pcma2:
       - abstract_pcma_server
       - disk.device.latency_pcma_server
@@ -313,16 +313,16 @@ topology_template:
       - disk.device.read.requests_pcma_server
       network.outgoing.packets.rate_pcm_port_3_0:
       - abstract_pcma_server
-      - network.outgoing.packets.rate_pcma_server_pcm_port_3
+      - network.outgoing.packets.rate_pcma_server_pcm_port_3_0
       disk.device.read.requests_server_pcma2:
       - abstract_pcma_server
       - disk.device.read.requests_pcma_server
       attachment_pcm_port_0_0:
       - abstract_pcma_server_1
-      - attachment_pcma_server_pcm_port_0
+      - attachment_pcma_server_pcm_port_0_0
       network.incoming.packets.rate_pcm_port_0_0:
       - abstract_pcma_server_1
-      - network.incoming.packets.rate_pcma_server_pcm_port_0
+      - network.incoming.packets.rate_pcma_server_pcm_port_0_0
       disk.write.bytes_server_pcma2:
       - abstract_pcma_server
       - disk.write.bytes_pcma_server
@@ -343,10 +343,10 @@ topology_template:
       - binding_pcma_server
       network.outgoing.bytes_pcm_port_3_0:
       - abstract_pcma_server
-      - network.outgoing.bytes_pcma_server_pcm_port_3
+      - network.outgoing.bytes_pcma_server_pcm_port_3_0
       binding_pcm_port_1_0:
       - abstract_pcma_server_1
-      - binding_pcma_server_pcm_port_1
+      - binding_pcma_server_pcm_port_1_0
       disk.write.bytes.rate_server_pcma2:
       - abstract_pcma_server
       - disk.write.bytes.rate_pcma_server
@@ -361,13 +361,13 @@ topology_template:
       - disk.root.size_pcma_server
       network.outgoing.bytes_pcm_port_1_0:
       - abstract_pcma_server_1
-      - network.outgoing.bytes_pcma_server_pcm_port_1
+      - network.outgoing.bytes_pcma_server_pcm_port_1_0
       network.outgoing.bytes.rate_pcm_port_0_0:
       - abstract_pcma_server_1
-      - network.outgoing.bytes.rate_pcma_server_pcm_port_0
+      - network.outgoing.bytes.rate_pcma_server_pcm_port_0_0
       network.outpoing.packets_pcm_port_3_0:
       - abstract_pcma_server
-      - network.outpoing.packets_pcma_server_pcm_port_3
+      - network.outpoing.packets_pcma_server_pcm_port_3_0
       disk.iops_server_pcma2:
       - abstract_pcma_server
       - disk.iops_pcma_server
@@ -376,7 +376,7 @@ topology_template:
       - disk.iops_pcma_server
       network.incoming.bytes.rate_pcm_port_3_0:
       - abstract_pcma_server
-      - network.incoming.bytes.rate_pcma_server_pcm_port_3
+      - network.incoming.bytes.rate_pcma_server_pcm_port_3_0
       disk.device.write.bytes.rate_server_pcma1:
       - abstract_pcma_server_1
       - disk.device.write.bytes.rate_pcma_server
@@ -385,22 +385,22 @@ topology_template:
       - disk.device.write.bytes.rate_pcma_server
       network.incoming.packets_pcm_port_0_0:
       - abstract_pcma_server_1
-      - network.incoming.packets_pcma_server_pcm_port_0
+      - network.incoming.packets_pcma_server_pcm_port_0_0
       network.incoming.bytes_pcm_port_1_0:
       - abstract_pcma_server_1
-      - network.incoming.bytes_pcma_server_pcm_port_1
+      - network.incoming.bytes_pcma_server_pcm_port_1_0
       disk.read.bytes_server_pcma1:
       - abstract_pcma_server_1
       - disk.read.bytes_pcma_server
       feature_pcm_port_3_0:
       - abstract_pcma_server
-      - feature_pcma_server_pcm_port_3
+      - feature_pcma_server_pcm_port_3_0
       disk.read.bytes_server_pcma2:
       - abstract_pcma_server
       - disk.read.bytes_pcma_server
       forwarder_pcm_port_1_0:
       - abstract_pcma_server_1
-      - forwarder_pcma_server_pcm_port_1
+      - forwarder_pcma_server_pcm_port_1_0
       cpu_util_server_pcma1:
       - abstract_pcma_server_1
       - cpu_util_pcma_server
@@ -409,16 +409,16 @@ topology_template:
       - cpu_util_pcma_server
       network.outgoing.packets.rate_pcm_port_2_0:
       - abstract_pcma_server
-      - network.outgoing.packets.rate_pcma_server_pcm_port_2
+      - network.outgoing.packets.rate_pcma_server_pcm_port_2_0
       attachment_pcm_port_3_0:
       - abstract_pcma_server
-      - attachment_pcma_server_pcm_port_3
+      - attachment_pcma_server_pcm_port_3_0
       feature_server_pcma2:
       - abstract_pcma_server
       - feature_pcma_server
       network.incoming.packets.rate_pcm_port_3_0:
       - abstract_pcma_server
-      - network.incoming.packets.rate_pcma_server_pcm_port_3
+      - network.incoming.packets.rate_pcma_server_pcm_port_3_0
       memory.usage_server_pcma2:
       - abstract_pcma_server
       - memory.usage_pcma_server
@@ -430,10 +430,10 @@ topology_template:
       - feature_pcma_server
       network.outgoing.bytes_pcm_port_2_0:
       - abstract_pcma_server
-      - network.outgoing.bytes_pcma_server_pcm_port_2
+      - network.outgoing.bytes_pcma_server_pcm_port_2_0
       binding_pcm_port_0_0:
       - abstract_pcma_server_1
-      - binding_pcma_server_pcm_port_0
+      - binding_pcma_server_pcm_port_0_0
       disk.read.bytes.rate_server_pcma1:
       - abstract_pcma_server_1
       - disk.read.bytes.rate_pcma_server
@@ -445,10 +445,10 @@ topology_template:
       - disk.device.read.bytes_pcma_server
       network.outpoing.packets_pcm_port_0_0:
       - abstract_pcma_server_1
-      - network.outpoing.packets_pcma_server_pcm_port_0
+      - network.outpoing.packets_pcma_server_pcm_port_0_0
       network.outgoing.bytes_pcm_port_0_0:
       - abstract_pcma_server_1
-      - network.outgoing.bytes_pcma_server_pcm_port_0
+      - network.outgoing.bytes_pcma_server_pcm_port_0_0
       endpoint_server_pcma2:
       - abstract_pcma_server
       - endpoint_pcma_server
@@ -472,10 +472,10 @@ topology_template:
       - host_pcma_server
       network.incoming.bytes.rate_pcm_port_2_0:
       - abstract_pcma_server
-      - network.incoming.bytes.rate_pcma_server_pcm_port_2
+      - network.incoming.bytes.rate_pcma_server_pcm_port_2_0
       network.outgoing.bytes.rate_pcm_port_3_0:
       - abstract_pcma_server
-      - network.outgoing.bytes.rate_pcma_server_pcm_port_3
+      - network.outgoing.bytes.rate_pcma_server_pcm_port_3_0
       disk.ephemeral.size_server_pcma1:
       - abstract_pcma_server_1
       - disk.ephemeral.size_pcma_server
@@ -496,7 +496,7 @@ topology_template:
       - disk.device.write.requests.rate_pcma_server
       network.incoming.packets_pcm_port_3_0:
       - abstract_pcma_server
-      - network.incoming.packets_pcma_server_pcm_port_3
+      - network.incoming.packets_pcma_server_pcm_port_3_0
       scalable_server_pcma2:
       - abstract_pcma_server
       - scalable_pcma_server
@@ -505,16 +505,16 @@ topology_template:
       - scalable_pcma_server
       network.incoming.bytes_pcm_port_2_0:
       - abstract_pcma_server
-      - network.incoming.bytes_pcma_server_pcm_port_2
+      - network.incoming.bytes_pcma_server_pcm_port_2_0
       feature_pcm_port_2_0:
       - abstract_pcma_server
-      - feature_pcma_server_pcm_port_2
+      - feature_pcma_server_pcm_port_2_0
       disk.device.write.requests_server_pcma1:
       - abstract_pcma_server_1
       - disk.device.write.requests_pcma_server
       forwarder_pcm_port_2_0:
       - abstract_pcma_server
-      - forwarder_pcma_server_pcm_port_2
+      - forwarder_pcma_server_pcm_port_2_0
       disk.device.write.requests_server_pcma2:
       - abstract_pcma_server
       - disk.device.write.requests_pcma_server
@@ -532,31 +532,31 @@ topology_template:
       - instance_pcma_server
       attachment_pcm_port_2_0:
       - abstract_pcma_server
-      - attachment_pcma_server_pcm_port_2
+      - attachment_pcma_server_pcm_port_2_0
       os_server_pcma1:
       - abstract_pcma_server_1
       - os_pcma_server
       network.outgoing.packets.rate_pcm_port_1_0:
       - abstract_pcma_server_1
-      - network.outgoing.packets.rate_pcma_server_pcm_port_1
+      - network.outgoing.packets.rate_pcma_server_pcm_port_1_0
       os_server_pcma2:
       - abstract_pcma_server
       - os_pcma_server
       network.incoming.packets.rate_pcm_port_2_0:
       - abstract_pcma_server
-      - network.incoming.packets.rate_pcma_server_pcm_port_2
+      - network.incoming.packets.rate_pcma_server_pcm_port_2_0
       binding_pcm_port_3_0:
       - abstract_pcma_server
-      - binding_pcma_server_pcm_port_3
+      - binding_pcma_server_pcm_port_3_0
       network.outpoing.packets_pcm_port_1_0:
       - abstract_pcma_server_1
-      - network.outpoing.packets_pcma_server_pcm_port_1
+      - network.outpoing.packets_pcma_server_pcm_port_1_0
       network.incoming.bytes.rate_pcm_port_1_0:
       - abstract_pcma_server_1
-      - network.incoming.bytes.rate_pcma_server_pcm_port_1
+      - network.incoming.bytes.rate_pcma_server_pcm_port_1_0
       network.outgoing.bytes.rate_pcm_port_2_0:
       - abstract_pcma_server
-      - network.outgoing.bytes.rate_pcma_server_pcm_port_2
+      - network.outgoing.bytes.rate_pcma_server_pcm_port_2_0
       disk.capacity_server_pcma1:
       - abstract_pcma_server_1
       - disk.capacity_pcma_server
@@ -565,7 +565,7 @@ topology_template:
       - disk.capacity_pcma_server
       network.incoming.packets_pcm_port_2_0:
       - abstract_pcma_server
-      - network.incoming.packets_pcma_server_pcm_port_2
+      - network.incoming.packets_pcma_server_pcm_port_2_0
       disk.write.requests_server_pcma1:
       - abstract_pcma_server_1
       - disk.write.requests_pcma_server
@@ -574,13 +574,13 @@ topology_template:
       - disk.write.requests_pcma_server
       network.incoming.bytes_pcm_port_3_0:
       - abstract_pcma_server
-      - network.incoming.bytes_pcma_server_pcm_port_3
+      - network.incoming.bytes_pcma_server_pcm_port_3_0
       forwarder_pcm_port_3_0:
       - abstract_pcma_server
-      - forwarder_pcma_server_pcm_port_3
+      - forwarder_pcma_server_pcm_port_3_0
       feature_pcm_port_1_0:
       - abstract_pcma_server_1
-      - feature_pcma_server_pcm_port_1
+      - feature_pcma_server_pcm_port_1_0
       disk.usage_server_pcma2:
       - abstract_pcma_server
       - disk.usage_pcma_server
@@ -601,7 +601,7 @@ topology_template:
       - memory.resident_pcma_server
       attachment_pcm_port_1_0:
       - abstract_pcma_server_1
-      - attachment_pcma_server_pcm_port_1
+      - attachment_pcma_server_pcm_port_1_0
       disk.device.write.bytes_server_pcma2:
       - abstract_pcma_server
       - disk.device.write.bytes_pcma_server
@@ -610,7 +610,7 @@ topology_template:
       - disk.allocation_pcma_server
       network.incoming.packets.rate_pcm_port_1_0:
       - abstract_pcma_server_1
-      - network.incoming.packets.rate_pcma_server_pcm_port_1
+      - network.incoming.packets.rate_pcma_server_pcm_port_1_0
       disk.allocation_server_pcma2:
       - abstract_pcma_server
       - disk.allocation_pcma_server
@@ -619,7 +619,7 @@ topology_template:
       - disk.device.write.bytes_pcma_server
       network.outgoing.packets.rate_pcm_port_0_0:
       - abstract_pcma_server_1
-      - network.outgoing.packets.rate_pcma_server_pcm_port_0
+      - network.outgoing.packets.rate_pcma_server_pcm_port_0_0
       cpu_server_pcma1:
       - abstract_pcma_server_1
       - cpu_pcma_server
@@ -628,7 +628,7 @@ topology_template:
       - cpu_pcma_server
       binding_pcm_port_2_0:
       - abstract_pcma_server
-      - binding_pcma_server_pcm_port_2
+      - binding_pcma_server_pcm_port_2_0
     requirements:
       dependency_server_pcma2:
       - abstract_pcma_server
@@ -644,25 +644,25 @@ topology_template:
       - local_storage_pcma_server
       dependency_pcm_port_3_0:
       - abstract_pcma_server
-      - dependency_pcma_server_pcm_port_3
+      - dependency_pcma_server_pcm_port_3_0
       link_pcm_port_1_0:
       - abstract_pcma_server_1
-      - link_pcma_server_pcm_port_1
+      - link_pcma_server_pcm_port_1_0
       dependency_pcm_port_2_0:
       - abstract_pcma_server
-      - dependency_pcma_server_pcm_port_2
+      - dependency_pcma_server_pcm_port_2_0
       link_pcm_port_2_0:
       - abstract_pcma_server
-      - link_pcma_server_pcm_port_2
+      - link_pcma_server_pcm_port_2_0
       dependency_pcm_port_1_0:
       - abstract_pcma_server_1
-      - dependency_pcma_server_pcm_port_1
+      - dependency_pcma_server_pcm_port_1_0
       dependency_pcm_port_0_0:
       - abstract_pcma_server_1
-      - dependency_pcma_server_pcm_port_0
+      - dependency_pcma_server_pcm_port_0_0
       link_pcm_port_0_0:
       - abstract_pcma_server_1
-      - link_pcma_server_pcm_port_0
+      - link_pcma_server_pcm_port_0_0
       link_pcm_port_3_0:
       - abstract_pcma_server
-      - link_pcma_server_pcm_port_3
+      - link_pcma_server_pcm_port_3_0
\ No newline at end of file