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>

8 files changed, 1364 insertions, 1364 deletions

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/GlobalSubstitutionTypesServiceTemplate.yaml
index f32cc59857..9456835eca 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -2136,86 +2136,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
@@ -2236,42 +2228,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
@@ -2282,7 +2282,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:
@@ -2300,27 +2300,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:
@@ -2333,12 +2333,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.
@@ -2351,9 +2345,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
@@ -2363,73 +2356,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
@@ -2437,42 +2435,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:
@@ -2489,19 +2475,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:
@@ -2513,15 +2499,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
@@ -2537,29 +2521,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:
@@ -2583,11 +2557,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.
@@ -2600,12 +2569,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.
@@ -2648,29 +2611,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
-      disk.usage_1c2_catalog_instance:
+      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
-      feature_1c2_catalog_instance:
-        type: tosca.capabilities.Node
+      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
-      network.incoming.packets.rate_1c2_catalog_instance_1c2_t1_port:
+      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.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.
@@ -2700,8 +2688,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
@@ -2714,16 +2714,16 @@ node_types:
   org.openecomp.resource.abstract.nodes.pcma_server_1:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
-      port_pcm_port_0_network_role:
-        type: string
-        required: true
-        status: SUPPORTED
       port_pcm_port_1_related_networks:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+      port_pcm_port_0_network_role:
+        type: string
+        required: true
+        status: SUPPORTED
       port_pcm_port_1_network_role_tag:
         type: string
         required: true
@@ -2782,11 +2782,11 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
-      port_pcm_port_0_exCP_naming:
+      port_pcm_port_1_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
-      port_pcm_port_1_exCP_naming:
+      port_pcm_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
@@ -2800,18 +2800,18 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      port_pcm_port_0_ip_requirements:
+      port_pcm_port_1_security_groups:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
-      port_pcm_port_1_security_groups:
+          type: json
+      port_pcm_port_0_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
+          type: org.openecomp.datatypes.network.IpRequirements
       compute_pcma_server_config_drive:
         type: list
         required: true
@@ -2860,16 +2860,16 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      port_pcm_port_0_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
-        required: true
-        status: SUPPORTED
       port_pcm_port_1_ip_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
+        required: true
+        status: SUPPORTED
       port_pcm_port_1_order:
         type: integer
         required: true
@@ -3303,43 +3303,55 @@ node_types:
   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
@@ -3349,34 +3361,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
@@ -3391,19 +3401,15 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: json
-      port_1b_t2_port_vlan_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.VlanRequirements
-      port_1b_t2_port_ip_requirements:
-        type: list
+      port_b_single_1b_t1_port_0_subnetpoolid:
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
-      port_1b_t1_port_network_role_tag:
+      port_b_single_1b_t2_port_0_network_role_tag:
         type: string
         required: true
         status: SUPPORTED
@@ -3413,26 +3419,20 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: json
-      port_1b_t1_port_subnetpoolid:
-        type: string
+      port_b_single_1b_t2_port_0_ip_requirements:
+        type: list
         required: true
         status: SUPPORTED
-      port_1b_t1_port_mac_requirements:
+        entry_schema:
+          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_1b_t2_port_network:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: string
-      port_1b_t1_port_vlan_requirements:
-        type: list
+      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
@@ -3443,7 +3443,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:
@@ -3461,43 +3461,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:
@@ -3514,23 +3504,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:
@@ -3547,6 +3570,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.
@@ -3559,25 +3592,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:
@@ -3601,49 +3634,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
@@ -3654,14 +3681,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.
@@ -3674,25 +3693,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:
@@ -3704,12 +3723,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:
@@ -3751,7 +3771,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:
@@ -3769,63 +3789,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:
@@ -3867,112 +3872,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
@@ -3981,85 +3965,101 @@ 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
+      port_1c1_scalling_instance_t1_port_0_vlan_requirements:
+        type: list
         required: true
         status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.VlanRequirements
       compute_1c1_scalling_instance_metadata:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: json
-      port_1c1_t1_port_subnetpoolid:
+      port_1c1_scalling_instance_t2_port_0_network_role_tag:
         type: string
         required: true
         status: SUPPORTED
-      port_1c1_t1_port_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_1c1_t1_port_tenant_id:
+      1c1_scalling_instance_instance_name:
         type: string
         status: SUPPORTED
-      1c1_scalling_instance_instance_name:
+      1c1_scalling_instance_1c1_scalling_instance_t1_port_0_tenant_id:
         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:
@@ -4079,14 +4079,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:
@@ -4122,17 +4122,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
@@ -4140,13 +4149,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:
@@ -4158,7 +4166,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
@@ -4169,18 +4177,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.
@@ -4193,7 +4189,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:
@@ -4204,24 +4200,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:
@@ -4238,14 +4229,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.
@@ -4258,19 +4241,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:
@@ -4283,33 +4260,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
@@ -4319,12 +4301,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.
@@ -4337,6 +4324,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.
@@ -4355,6 +4348,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.
@@ -4367,19 +4366,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:
@@ -4402,70 +4401,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:
@@ -5058,43 +5058,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_1b_t1_port_network_role:
+      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_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
@@ -5104,34 +5116,38 @@ 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
+          type: org.openecomp.datatypes.network.IpRequirements
+      port_b_single_1b_t1_port_0_value_specs:
+        type: list
         required: true
         status: SUPPORTED
+        entry_schema:
+          type: json
       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
@@ -5146,54 +5162,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
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
-      port_1b_t1_port_value_specs:
-        type: list
+      port_b_single_1b_t1_port_0_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: json
-      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
@@ -5204,7 +5204,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:
@@ -5222,43 +5222,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:
@@ -5275,23 +5265,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:
@@ -5308,6 +5331,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.
@@ -5320,25 +5353,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:
@@ -5362,49 +5395,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
@@ -5415,14 +5442,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.
@@ -5435,25 +5454,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:
@@ -5465,12 +5484,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:
@@ -5512,7 +5532,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:
@@ -5530,63 +5550,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:
@@ -5627,9 +5632,4 @@ node_types:
         type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
-        - UNBOUNDED
-      feature_b_single_1b_1b_t2_port:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
         - UNBOUNDED
\ 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/connectivityBetweenPatterns/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/MainServiceTemplate.yaml
index 76b05fba29..a29747f664 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/MainServiceTemplate.yaml
@@ -216,30 +216,26 @@ 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:
-        - ip_version: 4
-          ip_count_required:
-            is_required: false
-          floating_ip_count_required:
+        port_b_single_1b_t1_port_0_mac_requirements:
+          mac_count_required:
             is_required: false
         compute_b_single_1b_metadata:
         - connectivityTo4PNested:
@@ -261,16 +257,20 @@ topology_template:
           connectivityTo1C1_T1_1:
             get_attribute:
             - abstract_1c1_scalling_instance
-            - 1c1_scalling_instance_1c1_t1_port_tenant_id
+            - 1c1_scalling_instance_1c1_scalling_instance_t1_port_0_tenant_id
           connectivityTo1C1_T1_0:
             get_attribute:
             - abstract_1c1_scalling_instance
-            - 1c1_scalling_instance_1c1_t1_port_tenant_id
-        port_1b_t1_port_mac_requirements:
+            - 1c1_scalling_instance_1c1_scalling_instance_t1_port_0_tenant_id
+        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_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
@@ -284,7 +284,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
@@ -296,31 +296,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
@@ -329,10 +305,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
@@ -341,24 +319,42 @@ 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
@@ -392,6 +388,10 @@ topology_template:
             get_attribute:
             - abstract_b_single_1b
             - b_single_1b_instance_name
+        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
@@ -401,7 +401,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
@@ -448,11 +448,11 @@ topology_template:
             - instance_name
           connectivityTo1C1_T2_1:
             get_attribute:
-            - 1c1_t2_port_1
+            - 1c1_scalling_instance_1_t2_port_0
             - tenant_id
           connectivityTo1C1_T2_0:
             get_attribute:
-            - 1c1_t2_port_0
+            - 1c1_scalling_instance_0_t2_port_0
             - tenant_id
         pcm_image_name:
           get_input: pcm_image_name
@@ -490,23 +490,28 @@ 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_metadata:
         - connectivityTo4PNested:
             get_attribute:
@@ -531,29 +536,24 @@ topology_template:
           connectivityTo1C1_T2_1:
             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
           connectivityTo1C1_T2_0:
             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
         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:
@@ -565,7 +565,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
@@ -574,43 +574,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:
@@ -622,7 +622,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
@@ -637,10 +637,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
@@ -656,10 +656,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
         admin_state_up:
           get_attribute:
           - abstract_a_single_1a
@@ -684,10 +684,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:
@@ -695,11 +695,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:
@@ -715,7 +715,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:
@@ -727,11 +727,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:
@@ -778,11 +778,11 @@ topology_template:
           connectivityTo1C1_T2_1:
             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
           connectivityTo1C1_T2_0:
             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
         port_1a_t1_port_ip_requirements:
         - ip_version: 4
           ip_count_required:
@@ -870,11 +870,11 @@ topology_template:
           connectivityTo1C1_T2_1:
             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
           connectivityTo1C1_T2_0:
             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
         pcm_image_name:
           get_input: pcm_image_name
         security_group_name: jsa_security_group
@@ -998,43 +998,43 @@ 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
+        port_b_single_1b_t1_port_0_value_specs:
+        - get_attribute:
+          - abstract_a_single_1a
+          - a_single_1a_1a_t1_port_tenant_id
         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_value_specs:
-        - get_attribute:
-          - abstract_a_single_1a
-          - a_single_1a_1a_t1_port_tenant_id
-        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
@@ -1048,7 +1048,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
@@ -1099,10 +1099,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
@@ -1119,10 +1119,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:
@@ -1133,10 +1133,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:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/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/connectivityBetweenPatterns/out/Nested_1c1_scalling_instanceServiceTemplate.yaml
index 03cc64cfd6..c0e8f0f023 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/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/connectivityBetweenPatterns/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,87 +83,102 @@ 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
+    port_1c1_scalling_instance_t1_port_0_vlan_requirements:
+      type: list
       required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.VlanRequirements
     compute_1c1_scalling_instance_metadata:
       type: list
       required: true
       entry_schema:
         type: json
-    port_1c1_t1_port_subnetpoolid:
+    port_1c1_scalling_instance_t2_port_0_network_role_tag:
       type: string
       required: true
-    port_1c1_t1_port_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:
@@ -212,39 +212,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:
@@ -252,23 +252,23 @@ topology_template:
           node: 1c1_scalling_instance
           relationship: tosca.relationships.network.BindsTo
   outputs:
-    1c1_scalling_instance_1c1_t1_port_tenant_id:
-      type: string
-      value:
-        get_attribute:
-        - 1c1_scalling_instance_1c1_t1_port
-        - tenant_id
     1c1_scalling_instance_instance_name:
       type: string
       value:
         get_attribute:
         - 1c1_scalling_instance
         - instance_name
-    1c1_scalling_instance_1c1_t2_port_tenant_id:
+    1c1_scalling_instance_1c1_scalling_instance_t1_port_0_tenant_id:
+      type: string
+      value:
+        get_attribute:
+        - 1c1_scalling_instance_1c1_scalling_instance_t1_port_0
+        - 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
@@ -288,114 +288,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
@@ -405,21 +402,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
@@ -429,42 +429,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
@@ -472,17 +472,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/connectivityBetweenPatterns/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/connectivityBetweenPatterns/out/Nested_1c2_catalog_instanceServiceTemplate.yaml
index f3cf7861ae..d6f798fadf 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/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/connectivityBetweenPatterns/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
@@ -91,35 +85,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
@@ -153,62 +153,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:
@@ -222,11 +222,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
@@ -234,57 +234,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
@@ -294,63 +270,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
@@ -360,18 +348,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
@@ -393,18 +375,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
@@ -420,28 +414,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/connectivityBetweenPatterns/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/connectivityBetweenPatterns/out/Nested_b_single_1bServiceTemplate.yaml
index 163cde466b..333dc912e4 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/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/connectivityBetweenPatterns/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,17 +90,13 @@ topology_template:
       required: true
       entry_schema:
         type: json
-    port_1b_t2_port_vlan_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.VlanRequirements
-    port_1b_t2_port_ip_requirements:
-      type: list
+    port_b_single_1b_t1_port_0_subnetpoolid:
+      type: string
       required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.IpRequirements
-    port_1b_t1_port_network_role_tag:
+    port_b_single_1b_t2_port_0_network_role_tag:
       type: string
       required: true
     compute_b_single_1b_metadata:
@@ -99,22 +104,17 @@ topology_template:
       required: true
       entry_schema:
         type: json
-    port_1b_t1_port_subnetpoolid:
-      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
@@ -148,63 +148,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
@@ -217,21 +217,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
@@ -241,15 +235,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
@@ -259,24 +268,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
@@ -286,45 +301,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
@@ -334,15 +340,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
@@ -361,45 +370,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
@@ -418,25 +421,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/connectivityBetweenPatterns/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/connectivityBetweenPatterns/out/Nested_b_single_1b_1ServiceTemplate.yaml
index d2a4c87502..fc750eeb73 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/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/connectivityBetweenPatterns/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
-    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,32 @@ 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
+        type: org.openecomp.datatypes.network.IpRequirements
+    port_b_single_1b_t1_port_0_value_specs:
+      type: list
       required: true
+      entry_schema:
+        type: json
     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,45 +95,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
-      required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.IpRequirements
-    port_1b_t1_port_value_specs:
-      type: list
+    port_b_single_1b_t1_port_0_mac_requirements:
+      type: org.openecomp.datatypes.network.MacRequirements
       required: true
-      entry_schema:
-        type: json
-    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
@@ -149,66 +149,66 @@ 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:
-        mac_requirements:
-          get_input: port_1b_t1_port_mac_requirements
-        order:
-          get_input: port_1b_t1_port_order
-        value_specs:
-          get_input:
-          - port_1b_t1_port_value_specs
-          - index_value
         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
-        ip_requirements:
-          get_input: port_1b_t1_port_ip_requirements
         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_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_b_single_1b_t2_port_0_mac_requirements
+        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:
+        mac_requirements:
+          get_input: port_b_single_1b_t1_port_0_mac_requirements
+        order:
+          get_input: port_b_single_1b_t1_port_0_order
+        value_specs:
+          get_input:
+          - port_b_single_1b_t1_port_0_value_specs
+          - index_value
         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
         ip_requirements:
-          get_input: port_1b_t2_port_ip_requirements
+          get_input: port_b_single_1b_t1_port_0_ip_requirements
+        related_networks:
+          get_input: port_b_single_1b_t1_port_0_related_networks
         network_role_tag:
-          get_input: port_1b_t2_port_network_role_tag
-        mac_requirements:
-          get_input: port_1b_t2_port_mac_requirements
-        order:
-          get_input: port_1b_t2_port_order
+          get_input: port_b_single_1b_t1_port_0_network_role_tag
         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:
@@ -222,21 +222,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
@@ -246,15 +240,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
@@ -264,24 +273,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
@@ -291,45 +306,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
@@ -339,15 +345,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
@@ -366,45 +375,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
@@ -423,25 +426,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/connectivityBetweenPatterns/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/connectivityBetweenPatterns/out/Nested_pcma_server_1ServiceTemplate.yaml
index a149bdc39c..25ffdd165b 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/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/connectivityBetweenPatterns/out/Nested_pcma_server_1ServiceTemplate.yaml
@@ -11,14 +11,14 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
-    port_pcm_port_0_network_role:
-      type: string
-      required: true
     port_pcm_port_1_related_networks:
       type: list
       required: true
       entry_schema:
         type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+    port_pcm_port_0_network_role:
+      type: string
+      required: true
     port_pcm_port_1_network_role_tag:
       type: string
       required: true
@@ -65,10 +65,10 @@ topology_template:
     port_pcm_port_0_network_role_tag:
       type: string
       required: true
-    port_pcm_port_0_exCP_naming:
+    port_pcm_port_1_exCP_naming:
       type: org.openecomp.datatypes.Naming
       required: true
-    port_pcm_port_1_exCP_naming:
+    port_pcm_port_0_exCP_naming:
       type: org.openecomp.datatypes.Naming
       required: true
     port_pcm_port_1_network_role:
@@ -79,16 +79,16 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    port_pcm_port_0_ip_requirements:
+    port_pcm_port_1_security_groups:
       type: list
       required: true
       entry_schema:
-        type: org.openecomp.datatypes.network.IpRequirements
-    port_pcm_port_1_security_groups:
+        type: json
+    port_pcm_port_0_ip_requirements:
       type: list
       required: true
       entry_schema:
-        type: json
+        type: org.openecomp.datatypes.network.IpRequirements
     compute_pcma_server_config_drive:
       type: list
       required: true
@@ -129,14 +129,14 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    port_pcm_port_0_mac_requirements:
-      type: org.openecomp.datatypes.network.MacRequirements
-      required: true
     port_pcm_port_1_ip_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
+      required: true
     port_pcm_port_1_order:
       type: integer
       required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/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/connectivityBetweenPatterns/out/nested-no_vfc_v0.1ServiceTemplate.yaml
index 394046886b..06c80bf68b 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/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/connectivityBetweenPatterns/out/nested-no_vfc_v0.1ServiceTemplate.yaml
@@ -127,14 +127,14 @@ topology_template:
         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:
         - ip_version: 4
           ip_count_required:
             is_required: true
           floating_ip_count_required:
             is_required: false
-        port_pcm_port_1_security_groups:
-        - - get_input: security_group_name
         compute_pcma_server_config_drive:
         - true
         compute_pcma_server_user_data_format:
@@ -149,15 +149,15 @@ topology_template:
             get_input: oam_net_ip
         compute_pcma_server_name:
         - get_input: pcma_server_name
-        port_pcm_port_0_mac_requirements:
-          mac_count_required:
-            is_required: false
         port_pcm_port_1_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
         service_template_filter:
           substitute_service_template: Nested_pcma_server_1ServiceTemplate.yaml
           count: 1
@@ -669,4 +669,4 @@ topology_template:
       - dependency_pcma_server_pcm_port_1
       dependency_pcm_port_2:
       - abstract_pcma_server
-      - dependency_pcma_server_pcm_port_2
+      - dependency_pcma_server_pcm_port_2
\ No newline at end of file