duplicate ids

throw an exception when a zip with duplicate ids in different files is getting uploaded

Issue - Id : SDC-554

Change-Id: I213233d8833b89788f980db859d9597d2c1cb950
Signed-off-by: talio <tali.orenbach@amdocs.com>

20 files changed, 1459 insertions, 1459 deletions

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/in/nested-pcm_v0.1.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/in/nested-pcm_v0.1.yaml
index b6b85785cd..b08c486d85 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/in/nested-pcm_v0.1.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/in/nested-pcm_v0.1.yaml
@@ -71,15 +71,15 @@ resources:
       flavor: { get_param: pcm_flavor_name }
       availability_zone: { get_param: availabilityzone_name }
       networks:
-        - port: { get_resource: pcm_port_0}
-        - port: { get_resource: pcm_port_1}
+        - port: { get_resource: pcm_port_00}
+        - port: { get_resource: pcm_port_01}
       block_device_mapping:
         - device_name: vdb
           volume_id: { get_param: pcm_vol}
       user_data_format: RAW
       scheduler_hints: { group: { get_param: server_group }  }
 
-  pcm_port_0:
+  pcm_port_00:
     type: OS::Neutron::Port
     properties:
       network: { get_param: cps_net_name }
@@ -87,7 +87,7 @@ resources:
         - ip_address: { get_param: cps_net_ip }
       security_groups: [{ get_param: security_group_name }]
 
-  pcm_port_1:
+  pcm_port_01:
     type: OS::Neutron::Port
     properties:
       network: { get_param: oam_net_name }
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/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 6bd1ea45c8..0d89b398f9 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
@@ -1497,43 +1497,41 @@ node_types:
   org.openecomp.resource.abstract.nodes.heat.pcm_server:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
-      port_pcm_port_0_network_role:
+      availabilityzone_name:
         type: string
+        description: availabilityzone name
         required: true
         status: SUPPORTED
-      port_pcm_port_1_network_role_tag:
+      pcm_image_name:
         type: string
+        description: PCRF CM image name
         required: true
         status: SUPPORTED
-      availabilityzone_name:
-        type: string
-        description: availabilityzone name
+      port_pcm_port_00_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
         required: true
         status: SUPPORTED
-      port_pcm_port_0_vlan_requirements:
+      port_pcm_port_01_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
-      pcm_image_name:
+          type: org.openecomp.datatypes.network.IpRequirements
+      port_pcm_port_00_subnetpoolid:
         type: string
-        description: PCRF CM image name
         required: true
         status: SUPPORTED
-      port_pcm_port_0_order:
-        type: integer
-        required: true
-        status: SUPPORTED
-      port_pcm_port_0_subnetpoolid:
-        type: string
+      port_pcm_port_01_vlan_requirements:
+        type: list
         required: true
         status: SUPPORTED
-      port_pcm_port_1_subnetpoolid:
+        entry_schema:
+          type: org.openecomp.datatypes.network.VlanRequirements
+      port_pcm_port_01_network_role:
         type: string
         required: true
         status: SUPPORTED
-      port_pcm_port_0_network_role_tag:
+      port_pcm_port_01_subnetpoolid:
         type: string
         required: true
         status: SUPPORTED
@@ -1547,23 +1545,25 @@ node_types:
         description: CPS network mask
         required: true
         status: SUPPORTED
-      port_pcm_port_1_exCP_naming:
-        type: org.openecomp.datatypes.Naming
+      oam_net_name:
+        type: string
+        description: OAM network name
         required: true
         status: SUPPORTED
-      port_pcm_port_0_exCP_naming:
-        type: org.openecomp.datatypes.Naming
+      port_pcm_port_01_network_role_tag:
+        type: string
         required: true
         status: SUPPORTED
-      oam_net_name:
+      port_pcm_port_00_network_role:
         type: string
-        description: OAM network name
         required: true
         status: SUPPORTED
-      port_pcm_port_1_network_role:
-        type: string
+      port_pcm_port_00_ip_requirements:
+        type: list
         required: true
         status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.IpRequirements
       server_group:
         type: string
         required: true
@@ -1572,12 +1572,6 @@ node_types:
         type: json
         required: true
         status: SUPPORTED
-      port_pcm_port_0_ip_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
       oam_net_gw:
         type: string
         description: CPS network gateway
@@ -1593,36 +1587,42 @@ node_types:
         description: CPS network ip
         required: true
         status: SUPPORTED
-      port_pcm_port_1_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
+      port_pcm_port_00_network_role_tag:
+        type: string
         required: true
         status: SUPPORTED
-      port_pcm_port_1_vlan_requirements:
-        type: list
+      port_pcm_port_01_order:
+        type: integer
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
       pcm_flavor_name:
         type: string
         description: flavor name of PCRF CM instance
         required: true
         status: SUPPORTED
+      port_pcm_port_00_exCP_naming:
+        type: org.openecomp.datatypes.Naming
+        required: true
+        status: SUPPORTED
+      port_pcm_port_00_order:
+        type: integer
+        required: true
+        status: SUPPORTED
+      port_pcm_port_01_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
+        required: true
+        status: SUPPORTED
       pcm_vol:
         type: string
         description: CPS Cluman Cinder Volume
         required: true
         status: SUPPORTED
-      port_pcm_port_1_ip_requirements:
+      port_pcm_port_00_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
-      port_pcm_port_0_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
-        required: true
-        status: SUPPORTED
+          type: org.openecomp.datatypes.network.VlanRequirements
       cps_net_name:
         type: string
         description: CPS network name
@@ -1638,8 +1638,8 @@ node_types:
         description: CPS network mask
         required: true
         status: SUPPORTED
-      port_pcm_port_1_order:
-        type: integer
+      port_pcm_port_01_exCP_naming:
+        type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
     attributes:
@@ -1648,14 +1648,14 @@ node_types:
         description: the pcm nova service id
         status: SUPPORTED
     requirements:
-    - dependency_pcm_port_1:
+    - dependency_pcm_port_00:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_pcm_port_1:
+    - link_pcm_port_00:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
@@ -1675,57 +1675,55 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_pcm_port_0:
+    - dependency_pcm_port_01:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_pcm_port_0:
+    - link_pcm_port_01:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
         - 1
         - 1
     capabilities:
-      network.incoming.packets.rate_pcm_port_0:
+      cpu_server_pcm:
         type: org.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_server_pcm:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_pcm_port_00:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_pcm_port_1:
+      memory_server_pcm:
         type: org.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_pcm_port_1:
+      network.incoming.packets_pcm_port_01:
         type: org.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_server_pcm:
+      disk.write.requests_server_pcm:
         type: org.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_server_pcm:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_pcm_port_01:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_pcm_port_0:
+      network.incoming.packets_pcm_port_00:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -1749,150 +1747,132 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.usage_server_pcm:
+      network.outgoing.packets.rate_pcm_port_00:
         type: org.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_server_pcm:
+      network.incoming.bytes_pcm_port_00:
         type: org.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_server_pcm:
+      network.incoming.bytes_pcm_port_01:
         type: org.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_server_pcm:
+      disk.device.usage_server_pcm:
         type: org.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.root.size_server_pcm:
+      disk.allocation_server_pcm:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.ephemeral.size_server_pcm:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      attachment_pcm_port_00:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.latency_server_pcm:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      attachment_pcm_port_01:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_pcm_port_0:
+      disk.usage_server_pcm:
         type: org.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_pcm_port_1:
+      disk.device.write.bytes_server_pcm:
         type: org.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_pcm_port_0:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        occurrences:
-        - 0
-        - UNBOUNDED
-      binding_pcm_port_1:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        occurrences:
-        - 0
-        - UNBOUNDED
-      memory.usage_server_pcm:
+      network.outgoing.bytes_pcm_port_00:
         type: org.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_server_pcm:
+      disk.root.size_server_pcm:
         type: org.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_server_pcm:
+      disk.ephemeral.size_server_pcm:
         type: org.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_server_pcm:
-        type: tosca.capabilities.OperatingSystem
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.read.bytes_server_pcm:
+      disk.device.latency_server_pcm:
         type: org.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_pcm_port_0:
+      network.outgoing.packets.rate_pcm_port_01:
         type: org.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_pcm_port_1:
+      memory.usage_server_pcm:
         type: org.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_pcm_port_1:
-        type: tosca.capabilities.Node
+      network.outgoing.bytes_pcm_port_01:
+        type: org.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_pcm_port_0:
+      disk.read.requests_server_pcm:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes_server_pcm:
+      disk.capacity_server_pcm:
         type: org.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_pcm_port_0:
-        type: tosca.capabilities.Node
+      os_server_pcm:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_pcm_port_1:
+      disk.read.bytes_server_pcm:
         type: org.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_pcm_port_0:
-        type: tosca.capabilities.Attachment
+      disk.device.read.bytes_server_pcm:
+        type: org.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_pcm_port_1:
-        type: tosca.capabilities.Attachment
+      network.incoming.bytes.rate_pcm_port_00:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
@@ -1901,6 +1881,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      network.incoming.bytes.rate_pcm_port_01:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.read.requests.rate_server_pcm:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -1954,61 +1940,75 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests.rate_server_pcm:
+      network.outgoing.bytes.rate_pcm_port_01:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes.rate_server_pcm:
+      network.incoming.packets.rate_pcm_port_01:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      host_server_pcm:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
-        occurrences:
-        - 1
-        - UNBOUNDED
-      cpu.delta_server_pcm:
+      network.incoming.packets.rate_pcm_port_00:
         type: org.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_pcm_port_1:
+      binding_pcm_port_01:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
+      disk.write.requests.rate_server_pcm:
         type: org.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_pcm_port_0:
+      binding_pcm_port_00:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
+      disk.device.write.bytes.rate_server_pcm:
         type: org.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_server_pcm:
-        type: tosca.capabilities.network.Bindable
+      host_server_pcm:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_pcm_port_0:
+      network.outgoing.bytes.rate_pcm_port_00:
         type: org.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_server_pcm:
+      cpu.delta_server_pcm:
         type: org.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_pcm_port_1:
+      binding_server_pcm:
+        type: tosca.capabilities.network.Bindable
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.capacity_server_pcm:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -2043,7 +2043,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_pcm_port_0:
+      network.outpoing.packets_pcm_port_00:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -2055,7 +2055,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_pcm_port_1:
+      network.outpoing.packets_pcm_port_01:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -5416,4 +5416,4 @@ node_types:
         type: tosca.capabilities.Node
         occurrences:
         - 1
-        - UNBOUNDED
+        - 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 5d47b3076b..2921549e6b 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
@@ -277,8 +277,13 @@ topology_template:
       directives:
       - substitutable
       properties:
+        port_pcm_port_00_ip_requirements:
+        - ip_version: 4
+          ip_count_required:
+            is_required: true
+          floating_ip_count_required:
+            is_required: false
         server_group: BE_Affinity_group
-        port_pcm_port_1_network_role_tag: oam
         connectivityChk:
           connectivityTo1C2_1:
             get_attribute:
@@ -311,30 +316,24 @@ topology_template:
             get_attribute:
             - 1c1_t2_port_0
             - tenant_id
-        port_pcm_port_0_ip_requirements:
-        - ip_version: 4
-          ip_count_required:
-            is_required: true
-          floating_ip_count_required:
-            is_required: false
         pcm_image_name:
           get_input: pcm_image_name
-        security_group_name: jsa_security_group
-        port_pcm_port_1_mac_requirements:
+        port_pcm_port_00_mac_requirements:
           mac_count_required:
             is_required: false
-        pcm_flavor_name:
-          get_input: pcm_flavor_name
-        service_template_filter:
-          substitute_service_template: nested-pcm_v0.1ServiceTemplate.yaml
-        port_pcm_port_1_ip_requirements:
+        security_group_name: jsa_security_group
+        port_pcm_port_01_ip_requirements:
         - ip_version: 4
           ip_count_required:
             is_required: true
           floating_ip_count_required:
             is_required: false
-        port_pcm_port_0_network_role_tag: cps
-        port_pcm_port_0_mac_requirements:
+        port_pcm_port_00_network_role_tag: cps
+        pcm_flavor_name:
+          get_input: pcm_flavor_name
+        service_template_filter:
+          substitute_service_template: nested-pcm_v0.1ServiceTemplate.yaml
+        port_pcm_port_01_mac_requirements:
           mac_count_required:
             is_required: false
         pcm_server_name:
@@ -342,8 +341,9 @@ topology_template:
           - pcm_server_names
           - 0
         cps_net_name: nested_network
+        port_pcm_port_01_network_role_tag: oam
       requirements:
-      - link_pcm_port_0:
+      - link_pcm_port_00:
           capability: tosca.capabilities.network.Linkable
           node: nested_network
           relationship: tosca.relationships.network.LinksTo
@@ -840,11 +840,11 @@ topology_template:
           direction: ingress
       requirements:
       - port:
-          capability: attachment_pcm_port_0
+          capability: attachment_pcm_port_00
           node: 4p_nested
           relationship: org.openecomp.relationships.AttachesTo
       - port:
-          capability: attachment_pcm_port_1
+          capability: attachment_pcm_port_01
           node: 4p_nested
           relationship: org.openecomp.relationships.AttachesTo
       - port:
@@ -1032,4 +1032,4 @@ topology_template:
         name: def
         affinity: host
       targets:
-      - BE_Affinity_group
+      - BE_Affinity_group
\ 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-pcm_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-pcm_v0.1ServiceTemplate.yaml
index a4746fcd72..2a2b7dcacf 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/nested-pcm_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-pcm_v0.1ServiceTemplate.yaml
@@ -11,39 +11,38 @@ 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_network_role_tag:
-      type: string
-      required: true
     availabilityzone_name:
       label: availabilityzone name
       hidden: false
       immutable: false
       type: string
       description: availabilityzone name
-    port_pcm_port_0_vlan_requirements:
-      type: list
-      required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.VlanRequirements
     pcm_image_name:
       label: image name
       hidden: false
       immutable: false
       type: string
       description: PCRF CM image name
-    port_pcm_port_0_order:
-      type: integer
+    port_pcm_port_00_mac_requirements:
+      type: org.openecomp.datatypes.network.MacRequirements
       required: true
-    port_pcm_port_0_subnetpoolid:
+    port_pcm_port_01_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.IpRequirements
+    port_pcm_port_00_subnetpoolid:
       type: string
       required: true
-    port_pcm_port_1_subnetpoolid:
+    port_pcm_port_01_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.VlanRequirements
+    port_pcm_port_01_network_role:
       type: string
       required: true
-    port_pcm_port_0_network_role_tag:
+    port_pcm_port_01_subnetpoolid:
       type: string
       required: true
     pcm_server_name:
@@ -58,21 +57,23 @@ topology_template:
       immutable: false
       type: string
       description: CPS network mask
-    port_pcm_port_1_exCP_naming:
-      type: org.openecomp.datatypes.Naming
-      required: true
-    port_pcm_port_0_exCP_naming:
-      type: org.openecomp.datatypes.Naming
-      required: true
     oam_net_name:
       label: OAM network name
       hidden: false
       immutable: false
       type: string
       description: OAM network name
-    port_pcm_port_1_network_role:
+    port_pcm_port_01_network_role_tag:
+      type: string
+      required: true
+    port_pcm_port_00_network_role:
       type: string
       required: true
+    port_pcm_port_00_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.IpRequirements
     server_group:
       hidden: false
       immutable: false
@@ -81,11 +82,6 @@ topology_template:
       hidden: false
       immutable: false
       type: json
-    port_pcm_port_0_ip_requirements:
-      type: list
-      required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.IpRequirements
     oam_net_gw:
       label: CPS network gateway
       hidden: false
@@ -104,34 +100,38 @@ topology_template:
       immutable: false
       type: string
       description: CPS network ip
-    port_pcm_port_1_mac_requirements:
-      type: org.openecomp.datatypes.network.MacRequirements
+    port_pcm_port_00_network_role_tag:
+      type: string
       required: true
-    port_pcm_port_1_vlan_requirements:
-      type: list
+    port_pcm_port_01_order:
+      type: integer
       required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.VlanRequirements
     pcm_flavor_name:
       label: PCRF CM flavor name
       hidden: false
       immutable: false
       type: string
       description: flavor name of PCRF CM instance
+    port_pcm_port_00_exCP_naming:
+      type: org.openecomp.datatypes.Naming
+      required: true
+    port_pcm_port_00_order:
+      type: integer
+      required: true
+    port_pcm_port_01_mac_requirements:
+      type: org.openecomp.datatypes.network.MacRequirements
+      required: true
     pcm_vol:
       label: CPS Cluman Cinder Volume
       hidden: false
       immutable: false
       type: string
       description: CPS Cluman Cinder Volume
-    port_pcm_port_1_ip_requirements:
+    port_pcm_port_00_vlan_requirements:
       type: list
       required: true
       entry_schema:
-        type: org.openecomp.datatypes.network.IpRequirements
-    port_pcm_port_0_mac_requirements:
-      type: org.openecomp.datatypes.network.MacRequirements
-      required: true
+        type: org.openecomp.datatypes.network.VlanRequirements
     cps_net_name:
       label: CPS network name
       hidden: false
@@ -150,36 +150,36 @@ topology_template:
       immutable: false
       type: string
       description: CPS network mask
-    port_pcm_port_1_order:
-      type: integer
+    port_pcm_port_01_exCP_naming:
+      type: org.openecomp.datatypes.Naming
       required: true
   node_templates:
-    pcm_port_1:
+    pcm_port_00:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         ip_requirements:
-          get_input: port_pcm_port_1_ip_requirements
+          get_input: port_pcm_port_00_ip_requirements
         security_groups:
         - get_input: security_group_name
         network_role:
-          get_input: port_pcm_port_1_network_role
+          get_input: port_pcm_port_00_network_role
         fixed_ips:
         - ip_address:
-            get_input: oam_net_ip
+            get_input: cps_net_ip
         subnetpoolid:
-          get_input: port_pcm_port_1_subnetpoolid
+          get_input: port_pcm_port_00_subnetpoolid
         mac_requirements:
-          get_input: port_pcm_port_1_mac_requirements
+          get_input: port_pcm_port_00_mac_requirements
         exCP_naming:
-          get_input: port_pcm_port_1_exCP_naming
+          get_input: port_pcm_port_00_exCP_naming
         vlan_requirements:
-          get_input: port_pcm_port_1_vlan_requirements
+          get_input: port_pcm_port_00_vlan_requirements
         network_role_tag:
-          get_input: port_pcm_port_1_network_role_tag
+          get_input: port_pcm_port_00_network_role_tag
         network:
-          get_input: oam_net_name
+          get_input: cps_net_name
         order:
-          get_input: port_pcm_port_1_order
+          get_input: port_pcm_port_00_order
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
@@ -201,32 +201,32 @@ topology_template:
         scheduler_hints:
           group:
             get_input: server_group
-    pcm_port_0:
+    pcm_port_01:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         ip_requirements:
-          get_input: port_pcm_port_0_ip_requirements
+          get_input: port_pcm_port_01_ip_requirements
         security_groups:
         - get_input: security_group_name
         network_role:
-          get_input: port_pcm_port_0_network_role
+          get_input: port_pcm_port_01_network_role
         fixed_ips:
         - ip_address:
-            get_input: cps_net_ip
+            get_input: oam_net_ip
         subnetpoolid:
-          get_input: port_pcm_port_0_subnetpoolid
+          get_input: port_pcm_port_01_subnetpoolid
         mac_requirements:
-          get_input: port_pcm_port_0_mac_requirements
+          get_input: port_pcm_port_01_mac_requirements
         exCP_naming:
-          get_input: port_pcm_port_0_exCP_naming
+          get_input: port_pcm_port_01_exCP_naming
         vlan_requirements:
-          get_input: port_pcm_port_0_vlan_requirements
+          get_input: port_pcm_port_01_vlan_requirements
         network_role_tag:
-          get_input: port_pcm_port_0_network_role_tag
+          get_input: port_pcm_port_01_network_role_tag
         network:
-          get_input: cps_net_name
+          get_input: oam_net_name
         order:
-          get_input: port_pcm_port_0_order
+          get_input: port_pcm_port_01_order
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
@@ -239,9 +239,9 @@ topology_template:
         heat_file: ../Artifacts/nested-pcm_v0.1.yaml
         description: heat template that creates PCRF Cluman stack
       members:
-      - pcm_port_1
+      - pcm_port_00
       - server_pcm
-      - pcm_port_0
+      - pcm_port_01
   outputs:
     server_pcm_id:
       description: the pcm nova service id
@@ -249,27 +249,27 @@ topology_template:
   substitution_mappings:
     node_type: org.openecomp.resource.abstract.nodes.heat.pcm_server
     capabilities:
-      network.incoming.packets.rate_pcm_port_0:
-      - pcm_port_0
-      - network.incoming.packets.rate
       cpu_server_pcm:
       - server_pcm
       - cpu
-      network.incoming.packets.rate_pcm_port_1:
-      - pcm_port_1
-      - network.incoming.packets.rate
-      network.outpoing.packets_pcm_port_1:
-      - pcm_port_1
-      - network.outpoing.packets
+      feature_pcm_port_00:
+      - pcm_port_00
+      - feature
       memory_server_pcm:
       - server_pcm
       - memory
+      network.incoming.packets_pcm_port_01:
+      - pcm_port_01
+      - network.incoming.packets
       disk.write.requests_server_pcm:
       - server_pcm
       - disk.write.requests
-      network.outpoing.packets_pcm_port_0:
-      - pcm_port_0
-      - network.outpoing.packets
+      feature_pcm_port_01:
+      - pcm_port_01
+      - feature
+      network.incoming.packets_pcm_port_00:
+      - pcm_port_00
+      - network.incoming.packets
       disk.device.iops_server_pcm:
       - server_pcm
       - disk.device.iops
@@ -279,18 +279,36 @@ topology_template:
       disk.device.write.requests_server_pcm:
       - server_pcm
       - disk.device.write.requests
+      network.outgoing.packets.rate_pcm_port_00:
+      - pcm_port_00
+      - network.outgoing.packets.rate
+      network.incoming.bytes_pcm_port_00:
+      - pcm_port_00
+      - network.incoming.bytes
+      network.incoming.bytes_pcm_port_01:
+      - pcm_port_01
+      - network.incoming.bytes
       disk.device.usage_server_pcm:
       - server_pcm
       - disk.device.usage
       disk.allocation_server_pcm:
       - server_pcm
       - disk.allocation
+      attachment_pcm_port_00:
+      - pcm_port_00
+      - attachment
+      attachment_pcm_port_01:
+      - pcm_port_01
+      - attachment
       disk.usage_server_pcm:
       - server_pcm
       - disk.usage
       disk.device.write.bytes_server_pcm:
       - server_pcm
       - disk.device.write.bytes
+      network.outgoing.bytes_pcm_port_00:
+      - pcm_port_00
+      - network.outgoing.bytes
       disk.root.size_server_pcm:
       - server_pcm
       - disk.root.size
@@ -300,21 +318,15 @@ topology_template:
       disk.device.latency_server_pcm:
       - server_pcm
       - disk.device.latency
-      network.incoming.bytes_pcm_port_0:
-      - pcm_port_0
-      - network.incoming.bytes
-      network.incoming.bytes_pcm_port_1:
-      - pcm_port_1
-      - network.incoming.bytes
-      binding_pcm_port_0:
-      - pcm_port_0
-      - binding
-      binding_pcm_port_1:
-      - pcm_port_1
-      - binding
+      network.outgoing.packets.rate_pcm_port_01:
+      - pcm_port_01
+      - network.outgoing.packets.rate
       memory.usage_server_pcm:
       - server_pcm
       - memory.usage
+      network.outgoing.bytes_pcm_port_01:
+      - pcm_port_01
+      - network.outgoing.bytes
       disk.read.requests_server_pcm:
       - server_pcm
       - disk.read.requests
@@ -327,36 +339,18 @@ topology_template:
       disk.read.bytes_server_pcm:
       - server_pcm
       - disk.read.bytes
-      network.outgoing.packets.rate_pcm_port_0:
-      - pcm_port_0
-      - network.outgoing.packets.rate
-      network.outgoing.packets.rate_pcm_port_1:
-      - pcm_port_1
-      - network.outgoing.packets.rate
-      feature_pcm_port_1:
-      - pcm_port_1
-      - feature
-      network.outgoing.bytes_pcm_port_0:
-      - pcm_port_0
-      - network.outgoing.bytes
       disk.device.read.bytes_server_pcm:
       - server_pcm
       - disk.device.read.bytes
-      feature_pcm_port_0:
-      - pcm_port_0
-      - feature
-      network.outgoing.bytes_pcm_port_1:
-      - pcm_port_1
-      - network.outgoing.bytes
-      attachment_pcm_port_0:
-      - pcm_port_0
-      - attachment
-      attachment_pcm_port_1:
-      - pcm_port_1
-      - attachment
+      network.incoming.bytes.rate_pcm_port_00:
+      - pcm_port_00
+      - network.incoming.bytes.rate
       endpoint_server_pcm:
       - server_pcm
       - endpoint
+      network.incoming.bytes.rate_pcm_port_01:
+      - pcm_port_01
+      - network.incoming.bytes.rate
       disk.device.read.requests.rate_server_pcm:
       - server_pcm
       - disk.device.read.requests.rate
@@ -384,36 +378,42 @@ topology_template:
       cpu_util_server_pcm:
       - server_pcm
       - cpu_util
+      network.outgoing.bytes.rate_pcm_port_01:
+      - pcm_port_01
+      - network.outgoing.bytes.rate
+      network.incoming.packets.rate_pcm_port_01:
+      - pcm_port_01
+      - network.incoming.packets.rate
+      network.incoming.packets.rate_pcm_port_00:
+      - pcm_port_00
+      - network.incoming.packets.rate
+      binding_pcm_port_01:
+      - pcm_port_01
+      - binding
       disk.write.requests.rate_server_pcm:
       - server_pcm
       - disk.write.requests.rate
+      binding_pcm_port_00:
+      - pcm_port_00
+      - binding
       disk.device.write.bytes.rate_server_pcm:
       - server_pcm
       - disk.device.write.bytes.rate
       host_server_pcm:
       - server_pcm
       - host
+      network.outgoing.bytes.rate_pcm_port_00:
+      - pcm_port_00
+      - network.outgoing.bytes.rate
       cpu.delta_server_pcm:
       - server_pcm
       - cpu.delta
-      network.outgoing.bytes.rate_pcm_port_1:
-      - pcm_port_1
-      - network.outgoing.bytes.rate
-      network.incoming.packets_pcm_port_0:
-      - pcm_port_0
-      - network.incoming.packets
       binding_server_pcm:
       - server_pcm
       - binding
-      network.outgoing.bytes.rate_pcm_port_0:
-      - pcm_port_0
-      - network.outgoing.bytes.rate
       disk.device.capacity_server_pcm:
       - server_pcm
       - disk.device.capacity
-      network.incoming.packets_pcm_port_1:
-      - pcm_port_1
-      - network.incoming.packets
       instance_server_pcm:
       - server_pcm
       - instance
@@ -429,31 +429,31 @@ topology_template:
       feature_server_pcm:
       - server_pcm
       - feature
-      network.incoming.bytes.rate_pcm_port_0:
-      - pcm_port_0
-      - network.incoming.bytes.rate
+      network.outpoing.packets_pcm_port_00:
+      - pcm_port_00
+      - network.outpoing.packets
       disk.write.bytes.rate_server_pcm:
       - server_pcm
       - disk.write.bytes.rate
-      network.incoming.bytes.rate_pcm_port_1:
-      - pcm_port_1
-      - network.incoming.bytes.rate
+      network.outpoing.packets_pcm_port_01:
+      - pcm_port_01
+      - network.outpoing.packets
     requirements:
-      link_pcm_port_0:
-      - pcm_port_0
-      - link
-      link_pcm_port_1:
-      - pcm_port_1
-      - link
+      dependency_pcm_port_00:
+      - pcm_port_00
+      - dependency
       local_storage_server_pcm:
       - server_pcm
       - local_storage
-      dependency_pcm_port_0:
-      - pcm_port_0
+      dependency_pcm_port_01:
+      - pcm_port_01
       - dependency
+      link_pcm_port_01:
+      - pcm_port_01
+      - link
+      link_pcm_port_00:
+      - pcm_port_00
+      - link
       dependency_server_pcm:
       - server_pcm
-      - dependency
-      dependency_pcm_port_1:
-      - pcm_port_1
-      - dependency
+      - dependency
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/in/nested-no-nova.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/in/nested-no-nova.yaml
index 65a952dcca..30c7aa24c3 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/in/nested-no-nova.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/in/nested-no-nova.yaml
@@ -10,7 +10,7 @@ parameters:
 
 resources:
 
-  jsa_security_group:
+  jsa_security_group_1:
     type: OS::Neutron::SecurityGroup
     properties:
       description: ems security group
@@ -29,7 +29,7 @@ resources:
               {"direction": ingress, "ethertype": IPv6, "protocol": icmp, "remote_ip_prefix": "::/0"}
               ]
 
-  dependsOn_network:
+  dependsOn_network_0:
     type: OS::Neutron::Net
     properties:
       name:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/in/nested-no_vfc_v0.1.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/in/nested-no_vfc_v0.1.yaml
index 2548875c75..c91f0a304d 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/in/nested-no_vfc_v0.1.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/in/nested-no_vfc_v0.1.yaml
@@ -74,8 +74,8 @@ resources:
       flavor: { get_param: pcma_flavor_name }
       availability_zone: { get_param: availabilityzone_name }
       networks:
-        - port: { get_resource: pcm_port_0}
-        - port: { get_resource: pcm_port_1}
+        - port: { get_resource: pcm_port_0_0}
+        - port: { get_resource: pcm_port_1_0}
       block_device_mapping:
         - device_name: vdb
           volume_id: { get_param: pcm_vol}
@@ -90,15 +90,15 @@ resources:
       flavor: { get_param: pcma_flavor_name }
       availability_zone: { get_param: availabilityzone_name }
       networks:
-        - port: { get_resource: pcm_port_2}
-        - port: { get_resource: pcm_port_3}
+        - port: { get_resource: pcm_port_2_0}
+        - port: { get_resource: pcm_port_3_0}
       block_device_mapping:
         - device_name: vdb
           volume_id: { get_param: pcm_vol}
       user_data_format: RAW
       scheduler_hints: { group: { get_param: server_group }  }
 
-  pcm_port_0:
+  pcm_port_0_0:
     type: OS::Neutron::Port
     properties:
       network: { get_param: cps_net_name }
@@ -106,7 +106,7 @@ resources:
         - ip_address: { get_param: cps_net_ip }
       security_groups: [{ get_param: security_group_name }]
 
-  pcm_port_1:
+  pcm_port_1_0:
     type: OS::Neutron::Port
     properties:
       network: { get_param: oam_net_name }
@@ -114,7 +114,7 @@ resources:
         - ip_address: { get_param: oam_net_ip }
       security_groups: [{ get_param: security_group_name }]
 
-  pcm_port_2:
+  pcm_port_2_0:
     type: OS::Neutron::Port
     properties:
       network: { get_param: cps_net_name }
@@ -122,7 +122,7 @@ resources:
         - ip_address: { get_param: cps_net_ip }
       security_groups: [{ get_param: security_group_name }]
 
-  pcm_port_3:
+  pcm_port_3_0:
     type: OS::Neutron::Port
     properties:
       network: { get_param: oam_net_name }
@@ -132,4 +132,4 @@ resources:
 
 outputs:
   portId:
-    value: { get_resource: pcm_port_3 }
\ No newline at end of file
+    value: { get_resource: pcm_port_3_0 }
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml
index e44080f340..4b764a3b84 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -94,524 +94,484 @@ node_types:
         type: string
         status: SUPPORTED
     requirements:
-    - dependency_pcm_port_2:
+    - dependency_server_pcma2:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_pcm_port_2:
-        capability: tosca.capabilities.network.Linkable
-        relationship: tosca.relationships.network.LinksTo
+    - local_storage_server_pcma2:
+        capability: tosca.capabilities.Attachment
+        node: tosca.nodes.BlockStorage
+        relationship: tosca.relationships.AttachesTo
         occurrences:
-        - 1
-        - 1
-    - dependency_pcm_port_1:
+        - 0
+        - UNBOUNDED
+    - dependency_server_pcma1:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_pcm_port_1:
-        capability: tosca.capabilities.network.Linkable
-        relationship: tosca.relationships.network.LinksTo
+    - local_storage_server_pcma1:
+        capability: tosca.capabilities.Attachment
+        node: tosca.nodes.BlockStorage
+        relationship: tosca.relationships.AttachesTo
         occurrences:
-        - 1
-        - 1
-    - dependency_pcm_port_3:
+        - 0
+        - UNBOUNDED
+    - dependency_pcm_port_2_0:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_pcm_port_3:
+    - link_pcm_port_2_0:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
         - 1
         - 1
-    - dependency_server_pcma2:
+    - dependency_pcm_port_3_0:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - local_storage_server_pcma2:
-        capability: tosca.capabilities.Attachment
-        node: tosca.nodes.BlockStorage
-        relationship: tosca.relationships.AttachesTo
+    - link_pcm_port_3_0:
+        capability: tosca.capabilities.network.Linkable
+        relationship: tosca.relationships.network.LinksTo
         occurrences:
-        - 0
-        - UNBOUNDED
-    - dependency_server_pcma1:
+        - 1
+        - 1
+    - dependency_pcm_port_0_0:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - local_storage_server_pcma1:
-        capability: tosca.capabilities.Attachment
-        node: tosca.nodes.BlockStorage
-        relationship: tosca.relationships.AttachesTo
+    - link_pcm_port_0_0:
+        capability: tosca.capabilities.network.Linkable
+        relationship: tosca.relationships.network.LinksTo
         occurrences:
-        - 0
-        - UNBOUNDED
-    - dependency_pcm_port_0:
+        - 1
+        - 1
+    - dependency_pcm_port_1_0:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_pcm_port_0:
+    - link_pcm_port_1_0:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
         - 1
         - 1
     capabilities:
-      network.incoming.packets.rate_pcm_port_0:
+      network.outpoing.packets_pcm_port_2_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_pcm_port_3:
+      disk.device.iops_server_pcma2:
         type: org.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_pcm_port_2:
+      network.outgoing.bytes.rate_pcm_port_1_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_pcm_port_1:
+      disk.device.iops_server_pcma1:
         type: org.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_pcm_port_1:
+      network.incoming.bytes.rate_pcm_port_0_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.iops_server_pcma2:
+      disk.device.capacity_server_pcma2:
         type: org.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_pcm_port_0:
+      disk.device.capacity_server_pcma1:
         type: org.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_pcm_port_3:
+      disk.read.requests_server_pcma2:
         type: org.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_pcm_port_2:
+      disk.read.requests_server_pcma1:
         type: org.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_server_pcma1:
+      disk.write.requests.rate_server_pcma1:
         type: org.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_server_pcma2:
+      network.incoming.packets_pcm_port_1_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.capacity_server_pcma1:
+      network.incoming.bytes_pcm_port_0_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.requests_server_pcma2:
+      disk.write.requests.rate_server_pcma2:
         type: org.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_server_pcma1:
+      memory_server_pcma2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests.rate_server_pcma1:
+      memory_server_pcma1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests.rate_server_pcma2:
+      disk.device.read.bytes.rate_server_pcma1:
         type: org.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_server_pcma2:
+      feature_pcm_port_0_0:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.read.bytes.rate_server_pcma2:
         type: org.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_server_pcma1:
+      disk.device.latency_server_pcma2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes.rate_server_pcma1:
+      disk.device.usage_server_pcma2:
         type: org.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_pcm_port_3:
+      disk.device.latency_server_pcma1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes.rate_server_pcma2:
+      disk.device.usage_server_pcma1:
         type: org.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_pcm_port_3:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+      disk.device.read.requests_server_pcma1:
+        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
-      disk.device.latency_server_pcma2:
+      network.outgoing.packets.rate_pcm_port_3_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.usage_server_pcma2:
+      disk.device.read.requests_server_pcma2:
         type: org.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_pcm_port_0:
+      attachment_pcm_port_0_0:
+        type: tosca.capabilities.Attachment
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.incoming.packets.rate_pcm_port_0_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.latency_server_pcma1:
+      disk.write.bytes_server_pcma2:
         type: org.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_pcm_port_2:
+      disk.device.read.requests.rate_server_pcma1:
         type: org.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_pcm_port_1:
+      disk.device.read.requests.rate_server_pcma2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.usage_server_pcma1:
+      disk.write.bytes_server_pcma1:
         type: org.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_pcm_port_0:
+      binding_server_pcma1:
         type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
         occurrences:
-        - 0
+        - 1
         - UNBOUNDED
-      binding_pcm_port_1:
+      binding_server_pcma2:
         type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
         occurrences:
-        - 0
+        - 1
         - UNBOUNDED
-      binding_pcm_port_2:
+      network.outgoing.bytes_pcm_port_3_0:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      binding_pcm_port_1_0:
         type: tosca.capabilities.network.Bindable
         valid_source_types:
         - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
         occurrences:
         - 0
         - UNBOUNDED
-      network.incoming.bytes_pcm_port_3:
+      disk.write.bytes.rate_server_pcma2:
         type: org.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_pcm_port_3:
+      disk.write.bytes.rate_server_pcma1:
         type: org.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_server_pcma1:
+      disk.root.size_server_pcma2:
         type: org.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_server_pcma2:
+      disk.root.size_server_pcma1:
         type: org.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_pcm_port_0:
+      network.outgoing.bytes_pcm_port_1_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_pcm_port_1:
+      network.outgoing.bytes.rate_pcm_port_0_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes_server_pcma2:
+      network.outpoing.packets_pcm_port_3_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests.rate_server_pcma1:
+      disk.iops_server_pcma2:
         type: org.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_pcm_port_2:
+      disk.iops_server_pcma1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests.rate_server_pcma2:
+      network.incoming.bytes.rate_pcm_port_3_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes_server_pcma1:
+      disk.device.write.bytes.rate_server_pcma1:
         type: org.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_pcm_port_1:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      binding_server_pcma1:
-        type: tosca.capabilities.network.Bindable
-        occurrences:
-        - 1
-        - UNBOUNDED
-      network.outgoing.bytes_pcm_port_0:
+      disk.device.write.bytes.rate_server_pcma2:
         type: org.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_server_pcma2:
-        type: tosca.capabilities.network.Bindable
-        occurrences:
-        - 1
-        - UNBOUNDED
-      feature_pcm_port_0:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      network.outgoing.bytes_pcm_port_2:
+      network.incoming.packets_pcm_port_0_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_pcm_port_3:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      feature_pcm_port_2:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      network.outgoing.bytes_pcm_port_1:
+      network.incoming.bytes_pcm_port_1_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_pcm_port_0:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
-      attachment_pcm_port_1:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.write.bytes.rate_server_pcma2:
+      disk.read.bytes_server_pcma1:
         type: org.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_pcm_port_2:
-        type: tosca.capabilities.Attachment
+      feature_pcm_port_3_0:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes.rate_server_pcma1:
+      disk.read.bytes_server_pcma2:
         type: org.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_pcm_port_3:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.root.size_server_pcma2:
+      cpu_util_server_pcma1:
         type: org.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.root.size_server_pcma1:
+      cpu_util_server_pcma2:
         type: org.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_server_pcma2:
+      network.outgoing.packets.rate_pcm_port_2_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.iops_server_pcma1:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      attachment_pcm_port_3_0:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes.rate_server_pcma1:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_server_pcma2:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes.rate_server_pcma2:
+      network.incoming.packets.rate_pcm_port_3_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes_server_pcma1:
+      memory.usage_server_pcma2:
         type: org.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_server_pcma2:
+      memory.usage_server_pcma1:
         type: org.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_server_pcma1:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_server_pcma1:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_util_server_pcma2:
+      network.outgoing.bytes_pcm_port_2_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_server_pcma2:
-        type: tosca.capabilities.Node
+      binding_pcm_port_0_0:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
         occurrences:
-        - 1
+        - 0
         - UNBOUNDED
-      memory.usage_server_pcma2:
+      disk.read.bytes.rate_server_pcma1:
         type: org.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_server_pcma1:
+      disk.device.read.bytes_server_pcma2:
         type: org.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_server_pcma1:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.read.bytes.rate_server_pcma1:
+      disk.device.read.bytes_server_pcma1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes_server_pcma2:
+      network.outpoing.packets_pcm_port_0_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes_server_pcma1:
+      network.outgoing.bytes_pcm_port_0_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -659,6 +619,18 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      network.incoming.bytes.rate_pcm_port_2_0:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.outgoing.bytes.rate_pcm_port_3_0:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.ephemeral.size_server_pcma1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -695,6 +667,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      network.incoming.packets_pcm_port_3_0:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
       scalable_server_pcma2:
         type: tosca.capabilities.Scalable
         occurrences:
@@ -705,6 +683,17 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      network.incoming.bytes_pcm_port_2_0:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      feature_pcm_port_2_0:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.write.requests_server_pcma1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -741,83 +730,100 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      attachment_pcm_port_2_0:
+        type: tosca.capabilities.Attachment
+        occurrences:
+        - 1
+        - UNBOUNDED
       os_server_pcma1:
         type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
+      network.outgoing.packets.rate_pcm_port_1_0:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
       os_server_pcma2:
         type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      disk.capacity_server_pcma1:
+      network.incoming.packets.rate_pcm_port_2_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.capacity_server_pcma2:
+      binding_pcm_port_3_0:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
+      network.outpoing.packets_pcm_port_1_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests_server_pcma1:
+      network.incoming.bytes.rate_pcm_port_1_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests_server_pcma2:
+      network.outgoing.bytes.rate_pcm_port_2_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_pcm_port_1:
+      disk.capacity_server_pcma1:
         type: org.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_pcm_port_0:
+      disk.capacity_server_pcma2:
         type: org.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_pcm_port_2:
+      network.incoming.packets_pcm_port_2_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_pcm_port_0:
+      disk.write.requests_server_pcma1:
         type: org.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_pcm_port_3:
+      disk.write.requests_server_pcma2:
         type: org.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_server_pcma2:
+      network.incoming.bytes_pcm_port_3_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_pcm_port_2:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_pcm_port_1_0:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_pcm_port_3:
+      disk.usage_server_pcma2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -841,12 +847,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_pcm_port_1:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
       vcpus_server_pcma2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -859,65 +859,65 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes_server_pcma2:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      attachment_pcm_port_1_0:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      disk.allocation_server_pcma1:
+      disk.device.write.bytes_server_pcma2:
         type: org.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_server_pcma2:
+      disk.allocation_server_pcma1:
         type: org.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_server_pcma1:
+      network.incoming.packets.rate_pcm_port_1_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_server_pcma1:
+      disk.allocation_server_pcma2:
         type: org.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_pcm_port_0:
+      disk.device.write.bytes_server_pcma1:
         type: org.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_server_pcma2:
+      network.outgoing.packets.rate_pcm_port_0_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_pcm_port_3:
+      cpu_server_pcma1:
         type: org.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_pcm_port_2:
+      cpu_server_pcma2:
         type: org.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_pcm_port_1:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      binding_pcm_port_2_0:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
         occurrences:
-        - 1
+        - 0
         - UNBOUNDED
   org.openecomp.resource.abstract.nodes.pcma_server:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
@@ -2660,11 +2660,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
@@ -2678,18 +2678,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
@@ -2738,16 +2738,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
@@ -5392,50 +5392,50 @@ node_types:
         type: string
         status: SUPPORTED
     requirements:
-    - dependency_dependsOn_network:
+    - dependency_jsa_security_group_1:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_jsa_security_group:
-        capability: tosca.capabilities.Node
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.DependsOn
-        occurrences:
-        - 0
-        - UNBOUNDED
-    - port_jsa_security_group:
+    - port_jsa_security_group_1:
         capability: tosca.capabilities.Attachment
         node: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
         relationship: org.openecomp.relationships.AttachesTo
         occurrences:
         - 0
         - UNBOUNDED
-    capabilities:
-      end_point_dependsOn_network:
-        type: tosca.capabilities.Endpoint
+    - dependency_dependsOn_network_0:
+        capability: tosca.capabilities.Node
+        node: tosca.nodes.Root
+        relationship: tosca.relationships.DependsOn
         occurrences:
-        - 1
+        - 0
         - UNBOUNDED
-      link_dependsOn_network:
-        type: tosca.capabilities.network.Linkable
+    capabilities:
+      feature_jsa_security_group_1:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      feature_jsa_security_group:
+      feature_dependsOn_network_0:
         type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      feature_dependsOn_network:
-        type: tosca.capabilities.Node
+      link_dependsOn_network_0:
+        type: tosca.capabilities.network.Linkable
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_dependsOn_network:
+      attachment_dependsOn_network_0:
         type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
+      end_point_dependsOn_network_0:
+        type: tosca.capabilities.Endpoint
+        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/dependencyConnectivity/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/MainServiceTemplate.yaml
index 15a079d930..14cf9ceae0 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/MainServiceTemplate.yaml
@@ -102,11 +102,11 @@ topology_template:
           - 0
         cps_net_name: nested_network
       requirements:
-      - link_pcm_port_2:
+      - link_pcm_port_2_0:
           capability: tosca.capabilities.network.Linkable
           node: nested_network
           relationship: tosca.relationships.network.LinksTo
-      - link_pcm_port_0:
+      - link_pcm_port_0_0:
           capability: tosca.capabilities.network.Linkable
           node: nested_network
           relationship: tosca.relationships.network.LinksTo
@@ -686,19 +686,19 @@ topology_template:
           node: 4p_nested
           relationship: org.openecomp.relationships.AttachesTo
       - port:
-          capability: attachment_pcm_port_0
+          capability: attachment_pcm_port_0_0
           node: nestedNoNestedSingleComputePattern
           relationship: org.openecomp.relationships.AttachesTo
       - port:
-          capability: attachment_pcm_port_1
+          capability: attachment_pcm_port_3_0
           node: nestedNoNestedSingleComputePattern
           relationship: org.openecomp.relationships.AttachesTo
       - port:
-          capability: attachment_pcm_port_2
+          capability: attachment_pcm_port_2_0
           node: nestedNoNestedSingleComputePattern
           relationship: org.openecomp.relationships.AttachesTo
       - port:
-          capability: attachment_pcm_port_3
+          capability: attachment_pcm_port_1_0
           node: nestedNoNestedSingleComputePattern
           relationship: org.openecomp.relationships.AttachesTo
     abstract_b_single_1b_1:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_pcma_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_pcma_serverServiceTemplate.yaml
index 41bef51803..4a2f034765 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_pcma_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_pcma_serverServiceTemplate.yaml
@@ -441,4 +441,4 @@ topology_template:
       - link
       link_pcma_server_pcm_port_3:
       - pcma_server_pcm_port_3
-      - link
+      - link
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_pcma_server_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_pcma_server_1ServiceTemplate.yaml
index 0079f2a476..0e25828e1d 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_pcma_server_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_pcma_server_1ServiceTemplate.yaml
@@ -55,10 +55,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:
@@ -69,16 +69,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
@@ -119,14 +119,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
@@ -432,4 +432,4 @@ topology_template:
       - link
       dependency_pcma_server_pcm_port_0:
       - pcma_server_pcm_port_0
-      - dependency
+      - dependency
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/nested-no-novaServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/nested-no-novaServiceTemplate.yaml
index 23bca38425..6dcce5e85d 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/nested-no-novaServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/nested-no-novaServiceTemplate.yaml
@@ -17,12 +17,7 @@ topology_template:
       immutable: false
       type: string
   node_templates:
-    dependsOn_network:
-      type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net
-      properties:
-        network_name:
-          get_input: net_name
-    jsa_security_group:
+    jsa_security_group_1:
       type: org.openecomp.resource.vfc.rules.nodes.heat.network.neutron.SecurityRules
       properties:
         name:
@@ -93,6 +88,11 @@ topology_template:
           ethertype: IPv6
           remote_ip_prefix: ::/0
           direction: ingress
+    dependsOn_network_0:
+      type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net
+      properties:
+        network_name:
+          get_input: net_name
   groups:
     nested-no-nova_group:
       type: org.openecomp.groups.heat.HeatStack
@@ -100,36 +100,36 @@ topology_template:
         heat_file: ../Artifacts/nested-no-nova.yaml
         description: heat template that creates PCRF Cluman stack
       members:
-      - dependsOn_network
-      - jsa_security_group
+      - jsa_security_group_1
+      - dependsOn_network_0
   outputs:
     output1:
       value: myOutput
   substitution_mappings:
     node_type: org.openecomp.resource.abstract.nodes.heat.nested-no-nova
     capabilities:
-      end_point_dependsOn_network:
-      - dependsOn_network
-      - end_point
-      link_dependsOn_network:
-      - dependsOn_network
-      - link
-      feature_jsa_security_group:
-      - jsa_security_group
+      feature_jsa_security_group_1:
+      - jsa_security_group_1
       - feature
-      feature_dependsOn_network:
-      - dependsOn_network
+      feature_dependsOn_network_0:
+      - dependsOn_network_0
       - feature
-      attachment_dependsOn_network:
-      - dependsOn_network
+      link_dependsOn_network_0:
+      - dependsOn_network_0
+      - link
+      attachment_dependsOn_network_0:
+      - dependsOn_network_0
       - attachment
+      end_point_dependsOn_network_0:
+      - dependsOn_network_0
+      - end_point
     requirements:
-      dependency_dependsOn_network:
-      - dependsOn_network
+      dependency_dependsOn_network_0:
+      - dependsOn_network_0
       - dependency
-      port_jsa_security_group:
-      - jsa_security_group
+      port_jsa_security_group_1:
+      - jsa_security_group_1
       - port
-      dependency_jsa_security_group:
-      - jsa_security_group
-      - dependency
+      dependency_jsa_security_group_1:
+      - jsa_security_group_1
+      - dependency
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/nested-no_vfc_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/nested-no_vfc_v0.1ServiceTemplate.yaml
index 676798e9a3..c66869707d 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/nested-no_vfc_v0.1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/nested-no_vfc_v0.1ServiceTemplate.yaml
@@ -108,7 +108,7 @@ topology_template:
       directives:
       - substitutable
       properties:
-        port_pcm_port_1_network_role_tag: cps
+        port_pcm_port_1_network_role_tag: oam
         port_pcm_port_0_fixed_ips:
         - ip_address:
             get_input: cps_net_ip
@@ -123,14 +123,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:
@@ -145,15 +145,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
@@ -192,7 +192,7 @@ topology_template:
         port_pcm_port_2_mac_requirements:
           mac_count_required:
             is_required: false
-        port_pcm_port_3_network_role_tag: cps
+        port_pcm_port_3_network_role_tag: oam
         compute_pcma_server_config_drive:
         - true
         port_pcm_port_3_fixed_ips:
@@ -235,40 +235,25 @@ topology_template:
       - abstract_pcma_server_1
   outputs:
     portId:
-      value: pcm_port_3
+      value: pcm_port_3_0
   substitution_mappings:
     node_type: org.openecomp.resource.abstract.nodes.heat.nested-no_vfc_v0.1
     capabilities:
-      network.incoming.packets.rate_pcm_port_0:
-      - abstract_pcma_server_1
-      - network.incoming.packets.rate_pcma_server_pcm_port_0
-      network.incoming.packets.rate_pcm_port_3:
+      network.outpoing.packets_pcm_port_2_0:
       - abstract_pcma_server
-      - network.incoming.packets.rate_pcma_server_pcm_port_3
-      network.incoming.packets.rate_pcm_port_2:
-      - abstract_pcma_server
-      - network.incoming.packets.rate_pcma_server_pcm_port_2
-      network.incoming.packets.rate_pcm_port_1:
-      - abstract_pcma_server_1
-      - network.incoming.packets.rate_pcma_server_pcm_port_1
-      network.outpoing.packets_pcm_port_1:
-      - abstract_pcma_server_1
-      - network.outpoing.packets_pcma_server_pcm_port_1
+      - network.outpoing.packets_pcma_server_pcm_port_2
       disk.device.iops_server_pcma2:
       - abstract_pcma_server
       - disk.device.iops_pcma_server
-      network.outpoing.packets_pcm_port_0:
+      network.outgoing.bytes.rate_pcm_port_1_0:
       - abstract_pcma_server_1
-      - network.outpoing.packets_pcma_server_pcm_port_0
-      network.outpoing.packets_pcm_port_3:
-      - abstract_pcma_server
-      - network.outpoing.packets_pcma_server_pcm_port_3
-      network.outpoing.packets_pcm_port_2:
-      - abstract_pcma_server
-      - network.outpoing.packets_pcma_server_pcm_port_2
+      - network.outgoing.bytes.rate_pcma_server_pcm_port_1
       disk.device.iops_server_pcma1:
       - abstract_pcma_server_1
       - disk.device.iops_pcma_server
+      network.incoming.bytes.rate_pcm_port_0_0:
+      - abstract_pcma_server_1
+      - network.incoming.bytes.rate_pcma_server_pcm_port_0
       disk.device.capacity_server_pcma2:
       - abstract_pcma_server
       - disk.device.capacity_pcma_server
@@ -284,6 +269,12 @@ topology_template:
       disk.write.requests.rate_server_pcma1:
       - abstract_pcma_server_1
       - disk.write.requests.rate_pcma_server
+      network.incoming.packets_pcm_port_1_0:
+      - abstract_pcma_server_1
+      - network.incoming.packets_pcma_server_pcm_port_1
+      network.incoming.bytes_pcm_port_0_0:
+      - abstract_pcma_server_1
+      - network.incoming.bytes_pcma_server_pcm_port_0
       disk.write.requests.rate_server_pcma2:
       - abstract_pcma_server
       - disk.write.requests.rate_pcma_server
@@ -296,144 +287,111 @@ topology_template:
       disk.device.read.bytes.rate_server_pcma1:
       - abstract_pcma_server_1
       - disk.device.read.bytes.rate_pcma_server
-      network.outgoing.bytes_pcm_port_3:
-      - abstract_pcma_server
-      - network.outgoing.bytes_pcma_server_pcm_port_3
+      feature_pcm_port_0_0:
+      - abstract_pcma_server_1
+      - feature_pcma_server_pcm_port_0
       disk.device.read.bytes.rate_server_pcma2:
       - abstract_pcma_server
       - disk.device.read.bytes.rate_pcma_server
-      binding_pcm_port_3:
-      - abstract_pcma_server
-      - binding_pcma_server_pcm_port_3
       disk.device.latency_server_pcma2:
       - abstract_pcma_server
       - disk.device.latency_pcma_server
       disk.device.usage_server_pcma2:
       - abstract_pcma_server
       - disk.device.usage_pcma_server
-      network.incoming.bytes_pcm_port_0:
-      - abstract_pcma_server_1
-      - network.incoming.bytes_pcma_server_pcm_port_0
       disk.device.latency_server_pcma1:
       - abstract_pcma_server_1
       - disk.device.latency_pcma_server
-      network.incoming.bytes_pcm_port_2:
-      - abstract_pcma_server
-      - network.incoming.bytes_pcma_server_pcm_port_2
-      network.incoming.bytes_pcm_port_1:
-      - abstract_pcma_server_1
-      - network.incoming.bytes_pcma_server_pcm_port_1
       disk.device.usage_server_pcma1:
       - abstract_pcma_server_1
       - disk.device.usage_pcma_server
-      binding_pcm_port_0:
-      - abstract_pcma_server_1
-      - binding_pcma_server_pcm_port_0
-      binding_pcm_port_1:
-      - abstract_pcma_server_1
-      - binding_pcma_server_pcm_port_1
-      binding_pcm_port_2:
-      - abstract_pcma_server
-      - binding_pcma_server_pcm_port_2
-      network.incoming.bytes_pcm_port_3:
-      - abstract_pcma_server
-      - network.incoming.bytes_pcma_server_pcm_port_3
-      network.outgoing.packets.rate_pcm_port_3:
-      - abstract_pcma_server
-      - network.outgoing.packets.rate_pcma_server_pcm_port_3
       disk.device.read.requests_server_pcma1:
       - abstract_pcma_server_1
       - disk.device.read.requests_pcma_server
+      network.outgoing.packets.rate_pcm_port_3_0:
+      - abstract_pcma_server
+      - network.outgoing.packets.rate_pcma_server_pcm_port_3
       disk.device.read.requests_server_pcma2:
       - abstract_pcma_server
       - disk.device.read.requests_pcma_server
-      network.outgoing.packets.rate_pcm_port_0:
+      attachment_pcm_port_0_0:
       - abstract_pcma_server_1
-      - network.outgoing.packets.rate_pcma_server_pcm_port_0
-      network.outgoing.packets.rate_pcm_port_1:
+      - attachment_pcma_server_pcm_port_0
+      network.incoming.packets.rate_pcm_port_0_0:
       - abstract_pcma_server_1
-      - network.outgoing.packets.rate_pcma_server_pcm_port_1
+      - network.incoming.packets.rate_pcma_server_pcm_port_0
       disk.write.bytes_server_pcma2:
       - abstract_pcma_server
       - disk.write.bytes_pcma_server
       disk.device.read.requests.rate_server_pcma1:
       - abstract_pcma_server_1
       - disk.device.read.requests.rate_pcma_server
-      network.outgoing.packets.rate_pcm_port_2:
-      - abstract_pcma_server
-      - network.outgoing.packets.rate_pcma_server_pcm_port_2
       disk.device.read.requests.rate_server_pcma2:
       - abstract_pcma_server
       - disk.device.read.requests.rate_pcma_server
       disk.write.bytes_server_pcma1:
       - abstract_pcma_server_1
       - disk.write.bytes_pcma_server
-      feature_pcm_port_1:
-      - abstract_pcma_server_1
-      - feature_pcma_server_pcm_port_1
       binding_server_pcma1:
       - abstract_pcma_server_1
       - binding_pcma_server
-      network.outgoing.bytes_pcm_port_0:
-      - abstract_pcma_server_1
-      - network.outgoing.bytes_pcma_server_pcm_port_0
       binding_server_pcma2:
       - abstract_pcma_server
       - binding_pcma_server
-      feature_pcm_port_0:
-      - abstract_pcma_server_1
-      - feature_pcma_server_pcm_port_0
-      network.outgoing.bytes_pcm_port_2:
-      - abstract_pcma_server
-      - network.outgoing.bytes_pcma_server_pcm_port_2
-      feature_pcm_port_3:
+      network.outgoing.bytes_pcm_port_3_0:
       - abstract_pcma_server
-      - feature_pcma_server_pcm_port_3
-      feature_pcm_port_2:
-      - abstract_pcma_server
-      - feature_pcma_server_pcm_port_2
-      network.outgoing.bytes_pcm_port_1:
-      - abstract_pcma_server_1
-      - network.outgoing.bytes_pcma_server_pcm_port_1
-      attachment_pcm_port_0:
-      - abstract_pcma_server_1
-      - attachment_pcma_server_pcm_port_0
-      attachment_pcm_port_1:
+      - network.outgoing.bytes_pcma_server_pcm_port_3
+      binding_pcm_port_1_0:
       - abstract_pcma_server_1
-      - attachment_pcma_server_pcm_port_1
+      - binding_pcma_server_pcm_port_1
       disk.write.bytes.rate_server_pcma2:
       - abstract_pcma_server
       - disk.write.bytes.rate_pcma_server
-      attachment_pcm_port_2:
-      - abstract_pcma_server
-      - attachment_pcma_server_pcm_port_2
       disk.write.bytes.rate_server_pcma1:
       - abstract_pcma_server_1
       - disk.write.bytes.rate_pcma_server
-      attachment_pcm_port_3:
-      - abstract_pcma_server
-      - attachment_pcma_server_pcm_port_3
       disk.root.size_server_pcma2:
       - abstract_pcma_server
       - disk.root.size_pcma_server
       disk.root.size_server_pcma1:
       - abstract_pcma_server_1
       - disk.root.size_pcma_server
+      network.outgoing.bytes_pcm_port_1_0:
+      - abstract_pcma_server_1
+      - network.outgoing.bytes_pcma_server_pcm_port_1
+      network.outgoing.bytes.rate_pcm_port_0_0:
+      - abstract_pcma_server_1
+      - network.outgoing.bytes.rate_pcma_server_pcm_port_0
+      network.outpoing.packets_pcm_port_3_0:
+      - abstract_pcma_server
+      - network.outpoing.packets_pcma_server_pcm_port_3
       disk.iops_server_pcma2:
       - abstract_pcma_server
       - disk.iops_pcma_server
       disk.iops_server_pcma1:
       - abstract_pcma_server_1
       - disk.iops_pcma_server
+      network.incoming.bytes.rate_pcm_port_3_0:
+      - abstract_pcma_server
+      - network.incoming.bytes.rate_pcma_server_pcm_port_3
       disk.device.write.bytes.rate_server_pcma1:
       - abstract_pcma_server_1
       - disk.device.write.bytes.rate_pcma_server
       disk.device.write.bytes.rate_server_pcma2:
       - abstract_pcma_server
       - disk.device.write.bytes.rate_pcma_server
+      network.incoming.packets_pcm_port_0_0:
+      - abstract_pcma_server_1
+      - network.incoming.packets_pcma_server_pcm_port_0
+      network.incoming.bytes_pcm_port_1_0:
+      - abstract_pcma_server_1
+      - network.incoming.bytes_pcma_server_pcm_port_1
       disk.read.bytes_server_pcma1:
       - abstract_pcma_server_1
       - disk.read.bytes_pcma_server
+      feature_pcm_port_3_0:
+      - abstract_pcma_server
+      - feature_pcma_server_pcm_port_3
       disk.read.bytes_server_pcma2:
       - abstract_pcma_server
       - disk.read.bytes_pcma_server
@@ -443,9 +401,18 @@ topology_template:
       cpu_util_server_pcma2:
       - abstract_pcma_server
       - cpu_util_pcma_server
+      network.outgoing.packets.rate_pcm_port_2_0:
+      - abstract_pcma_server
+      - network.outgoing.packets.rate_pcma_server_pcm_port_2
+      attachment_pcm_port_3_0:
+      - abstract_pcma_server
+      - attachment_pcma_server_pcm_port_3
       feature_server_pcma2:
       - abstract_pcma_server
       - feature_pcma_server
+      network.incoming.packets.rate_pcm_port_3_0:
+      - abstract_pcma_server
+      - network.incoming.packets.rate_pcma_server_pcm_port_3
       memory.usage_server_pcma2:
       - abstract_pcma_server
       - memory.usage_pcma_server
@@ -455,6 +422,12 @@ topology_template:
       feature_server_pcma1:
       - abstract_pcma_server_1
       - feature_pcma_server
+      network.outgoing.bytes_pcm_port_2_0:
+      - abstract_pcma_server
+      - network.outgoing.bytes_pcma_server_pcm_port_2
+      binding_pcm_port_0_0:
+      - abstract_pcma_server_1
+      - binding_pcma_server_pcm_port_0
       disk.read.bytes.rate_server_pcma1:
       - abstract_pcma_server_1
       - disk.read.bytes.rate_pcma_server
@@ -464,6 +437,12 @@ topology_template:
       disk.device.read.bytes_server_pcma1:
       - abstract_pcma_server_1
       - disk.device.read.bytes_pcma_server
+      network.outpoing.packets_pcm_port_0_0:
+      - abstract_pcma_server_1
+      - network.outpoing.packets_pcma_server_pcm_port_0
+      network.outgoing.bytes_pcm_port_0_0:
+      - abstract_pcma_server_1
+      - network.outgoing.bytes_pcma_server_pcm_port_0
       endpoint_server_pcma2:
       - abstract_pcma_server
       - endpoint_pcma_server
@@ -485,6 +464,12 @@ topology_template:
       host_server_pcma1:
       - abstract_pcma_server_1
       - host_pcma_server
+      network.incoming.bytes.rate_pcm_port_2_0:
+      - abstract_pcma_server
+      - network.incoming.bytes.rate_pcma_server_pcm_port_2
+      network.outgoing.bytes.rate_pcm_port_3_0:
+      - abstract_pcma_server
+      - network.outgoing.bytes.rate_pcma_server_pcm_port_3
       disk.ephemeral.size_server_pcma1:
       - abstract_pcma_server_1
       - disk.ephemeral.size_pcma_server
@@ -503,12 +488,21 @@ topology_template:
       disk.device.write.requests.rate_server_pcma1:
       - abstract_pcma_server_1
       - disk.device.write.requests.rate_pcma_server
+      network.incoming.packets_pcm_port_3_0:
+      - abstract_pcma_server
+      - network.incoming.packets_pcma_server_pcm_port_3
       scalable_server_pcma2:
       - abstract_pcma_server
       - scalable_pcma_server
       scalable_server_pcma1:
       - abstract_pcma_server_1
       - scalable_pcma_server
+      network.incoming.bytes_pcm_port_2_0:
+      - abstract_pcma_server
+      - network.incoming.bytes_pcma_server_pcm_port_2
+      feature_pcm_port_2_0:
+      - abstract_pcma_server
+      - feature_pcma_server_pcm_port_2
       disk.device.write.requests_server_pcma1:
       - abstract_pcma_server_1
       - disk.device.write.requests_pcma_server
@@ -527,48 +521,57 @@ topology_template:
       instance_server_pcma1:
       - abstract_pcma_server_1
       - instance_pcma_server
+      attachment_pcm_port_2_0:
+      - abstract_pcma_server
+      - attachment_pcma_server_pcm_port_2
       os_server_pcma1:
       - abstract_pcma_server_1
       - os_pcma_server
+      network.outgoing.packets.rate_pcm_port_1_0:
+      - abstract_pcma_server_1
+      - network.outgoing.packets.rate_pcma_server_pcm_port_1
       os_server_pcma2:
       - abstract_pcma_server
       - os_pcma_server
+      network.incoming.packets.rate_pcm_port_2_0:
+      - abstract_pcma_server
+      - network.incoming.packets.rate_pcma_server_pcm_port_2
+      binding_pcm_port_3_0:
+      - abstract_pcma_server
+      - binding_pcma_server_pcm_port_3
+      network.outpoing.packets_pcm_port_1_0:
+      - abstract_pcma_server_1
+      - network.outpoing.packets_pcma_server_pcm_port_1
+      network.incoming.bytes.rate_pcm_port_1_0:
+      - abstract_pcma_server_1
+      - network.incoming.bytes.rate_pcma_server_pcm_port_1
+      network.outgoing.bytes.rate_pcm_port_2_0:
+      - abstract_pcma_server
+      - network.outgoing.bytes.rate_pcma_server_pcm_port_2
       disk.capacity_server_pcma1:
       - abstract_pcma_server_1
       - disk.capacity_pcma_server
       disk.capacity_server_pcma2:
       - abstract_pcma_server
       - disk.capacity_pcma_server
+      network.incoming.packets_pcm_port_2_0:
+      - abstract_pcma_server
+      - network.incoming.packets_pcma_server_pcm_port_2
       disk.write.requests_server_pcma1:
       - abstract_pcma_server_1
       - disk.write.requests_pcma_server
       disk.write.requests_server_pcma2:
       - abstract_pcma_server
       - disk.write.requests_pcma_server
-      network.outgoing.bytes.rate_pcm_port_1:
-      - abstract_pcma_server_1
-      - network.outgoing.bytes.rate_pcma_server_pcm_port_1
-      network.incoming.packets_pcm_port_0:
-      - abstract_pcma_server_1
-      - network.incoming.packets_pcma_server_pcm_port_0
-      network.outgoing.bytes.rate_pcm_port_2:
+      network.incoming.bytes_pcm_port_3_0:
       - abstract_pcma_server
-      - network.outgoing.bytes.rate_pcma_server_pcm_port_2
-      network.outgoing.bytes.rate_pcm_port_0:
+      - network.incoming.bytes_pcma_server_pcm_port_3
+      feature_pcm_port_1_0:
       - abstract_pcma_server_1
-      - network.outgoing.bytes.rate_pcma_server_pcm_port_0
-      network.incoming.packets_pcm_port_3:
-      - abstract_pcma_server
-      - network.incoming.packets_pcma_server_pcm_port_3
+      - feature_pcma_server_pcm_port_1
       disk.usage_server_pcma2:
       - abstract_pcma_server
       - disk.usage_pcma_server
-      network.incoming.packets_pcm_port_2:
-      - abstract_pcma_server
-      - network.incoming.packets_pcma_server_pcm_port_2
-      network.outgoing.bytes.rate_pcm_port_3:
-      - abstract_pcma_server
-      - network.outgoing.bytes.rate_pcma_server_pcm_port_3
       disk.usage_server_pcma1:
       - abstract_pcma_server_1
       - disk.usage_pcma_server
@@ -578,45 +581,42 @@ topology_template:
       memory.resident_server_pcma1:
       - abstract_pcma_server_1
       - memory.resident_pcma_server
-      network.incoming.packets_pcm_port_1:
-      - abstract_pcma_server_1
-      - network.incoming.packets_pcma_server_pcm_port_1
       vcpus_server_pcma2:
       - abstract_pcma_server
       - vcpus_pcma_server
       memory.resident_server_pcma2:
       - abstract_pcma_server
       - memory.resident_pcma_server
+      attachment_pcm_port_1_0:
+      - abstract_pcma_server_1
+      - attachment_pcma_server_pcm_port_1
       disk.device.write.bytes_server_pcma2:
       - abstract_pcma_server
       - disk.device.write.bytes_pcma_server
       disk.allocation_server_pcma1:
       - abstract_pcma_server_1
       - disk.allocation_pcma_server
+      network.incoming.packets.rate_pcm_port_1_0:
+      - abstract_pcma_server_1
+      - network.incoming.packets.rate_pcma_server_pcm_port_1
       disk.allocation_server_pcma2:
       - abstract_pcma_server
       - disk.allocation_pcma_server
       disk.device.write.bytes_server_pcma1:
       - abstract_pcma_server_1
       - disk.device.write.bytes_pcma_server
+      network.outgoing.packets.rate_pcm_port_0_0:
+      - abstract_pcma_server_1
+      - network.outgoing.packets.rate_pcma_server_pcm_port_0
       cpu_server_pcma1:
       - abstract_pcma_server_1
       - cpu_pcma_server
-      network.incoming.bytes.rate_pcm_port_0:
-      - abstract_pcma_server_1
-      - network.incoming.bytes.rate_pcma_server_pcm_port_0
       cpu_server_pcma2:
       - abstract_pcma_server
       - cpu_pcma_server
-      network.incoming.bytes.rate_pcm_port_3:
-      - abstract_pcma_server
-      - network.incoming.bytes.rate_pcma_server_pcm_port_3
-      network.incoming.bytes.rate_pcm_port_2:
+      binding_pcm_port_2_0:
       - abstract_pcma_server
-      - network.incoming.bytes.rate_pcma_server_pcm_port_2
-      network.incoming.bytes.rate_pcm_port_1:
-      - abstract_pcma_server_1
-      - network.incoming.bytes.rate_pcma_server_pcm_port_1
+      - binding_pcma_server_pcm_port_2
     requirements:
       dependency_server_pcma2:
       - abstract_pcma_server
@@ -624,33 +624,33 @@ topology_template:
       local_storage_server_pcma2:
       - abstract_pcma_server
       - local_storage_pcma_server
-      link_pcm_port_0:
-      - abstract_pcma_server_1
-      - link_pcma_server_pcm_port_0
-      link_pcm_port_1:
-      - abstract_pcma_server_1
-      - link_pcma_server_pcm_port_1
       dependency_server_pcma1:
       - abstract_pcma_server_1
       - dependency_pcma_server
       local_storage_server_pcma1:
       - abstract_pcma_server_1
       - local_storage_pcma_server
-      link_pcm_port_2:
+      dependency_pcm_port_3_0:
       - abstract_pcma_server
-      - link_pcma_server_pcm_port_2
-      link_pcm_port_3:
-      - abstract_pcma_server
-      - link_pcma_server_pcm_port_3
-      dependency_pcm_port_0:
+      - dependency_pcma_server_pcm_port_3
+      link_pcm_port_1_0:
       - abstract_pcma_server_1
-      - dependency_pcma_server_pcm_port_0
-      dependency_pcm_port_3:
+      - link_pcma_server_pcm_port_1
+      dependency_pcm_port_2_0:
       - abstract_pcma_server
-      - dependency_pcma_server_pcm_port_3
-      dependency_pcm_port_1:
+      - dependency_pcma_server_pcm_port_2
+      link_pcm_port_2_0:
+      - abstract_pcma_server
+      - link_pcma_server_pcm_port_2
+      dependency_pcm_port_1_0:
       - abstract_pcma_server_1
       - dependency_pcma_server_pcm_port_1
-      dependency_pcm_port_2:
+      dependency_pcm_port_0_0:
+      - abstract_pcma_server_1
+      - dependency_pcma_server_pcm_port_0
+      link_pcm_port_0_0:
+      - abstract_pcma_server_1
+      - link_pcma_server_pcm_port_0
+      link_pcm_port_3_0:
       - abstract_pcma_server
-      - dependency_pcma_server_pcm_port_2
+      - link_pcma_server_pcm_port_3
\ 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/oneAppearancePerPattern/in/nested-pcm_v0.1.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/in/nested-pcm_v0.1.yaml
index b2695460d0..887ff6a42d 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/in/nested-pcm_v0.1.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/in/nested-pcm_v0.1.yaml
@@ -68,15 +68,15 @@ resources:
       flavor: { get_param: pcm_flavor_name }
       availability_zone: { get_param: availabilityzone_name }
       networks:
-        - port: { get_resource: pcm_port_0}
-        - port: { get_resource: pcm_port_1}
+        - port: { get_resource: pcm_port_00}
+        - port: { get_resource: pcm_port_01}
       block_device_mapping:
         - device_name: vdb
           volume_id: { get_param: pcm_vol}
       user_data_format: RAW
       scheduler_hints: { group: { get_param: server_group }  }
 
-  pcm_port_0:
+  pcm_port_00:
     type: OS::Neutron::Port
     properties:
       network: { get_param: cps_net_name }
@@ -84,7 +84,7 @@ resources:
         - ip_address: { get_param: cps_net_ip }
       security_groups: [{ get_param: security_group_name }]
 
-  pcm_port_1:
+  pcm_port_01:
     type: OS::Neutron::Port
     properties:
       network: { get_param: oam_net_name }
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 14b52bc131..49ac20889a 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -1493,43 +1493,41 @@ node_types:
   org.openecomp.resource.abstract.nodes.heat.pcm_server:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
-      port_pcm_port_0_network_role:
+      availabilityzone_name:
         type: string
+        description: availabilityzone name
         required: true
         status: SUPPORTED
-      port_pcm_port_1_network_role_tag:
+      pcm_image_name:
         type: string
+        description: PCRF CM image name
         required: true
         status: SUPPORTED
-      availabilityzone_name:
-        type: string
-        description: availabilityzone name
+      port_pcm_port_00_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
         required: true
         status: SUPPORTED
-      port_pcm_port_0_vlan_requirements:
+      port_pcm_port_01_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
-      pcm_image_name:
+          type: org.openecomp.datatypes.network.IpRequirements
+      port_pcm_port_00_subnetpoolid:
         type: string
-        description: PCRF CM image name
         required: true
         status: SUPPORTED
-      port_pcm_port_0_order:
-        type: integer
-        required: true
-        status: SUPPORTED
-      port_pcm_port_0_subnetpoolid:
-        type: string
+      port_pcm_port_01_vlan_requirements:
+        type: list
         required: true
         status: SUPPORTED
-      port_pcm_port_1_subnetpoolid:
+        entry_schema:
+          type: org.openecomp.datatypes.network.VlanRequirements
+      port_pcm_port_01_network_role:
         type: string
         required: true
         status: SUPPORTED
-      port_pcm_port_0_network_role_tag:
+      port_pcm_port_01_subnetpoolid:
         type: string
         required: true
         status: SUPPORTED
@@ -1543,33 +1541,29 @@ node_types:
         description: CPS network mask
         required: true
         status: SUPPORTED
-      port_pcm_port_1_exCP_naming:
-        type: org.openecomp.datatypes.Naming
-        required: true
-        status: SUPPORTED
-      port_pcm_port_0_exCP_naming:
-        type: org.openecomp.datatypes.Naming
-        required: true
-        status: SUPPORTED
       oam_net_name:
         type: string
         description: OAM network name
         required: true
         status: SUPPORTED
-      port_pcm_port_1_network_role:
+      port_pcm_port_01_network_role_tag:
         type: string
         required: true
         status: SUPPORTED
-      server_group:
+      port_pcm_port_00_network_role:
         type: string
         required: true
         status: SUPPORTED
-      port_pcm_port_0_ip_requirements:
+      port_pcm_port_00_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
+      server_group:
+        type: string
+        required: true
+        status: SUPPORTED
       oam_net_gw:
         type: string
         description: CPS network gateway
@@ -1585,36 +1579,42 @@ node_types:
         description: CPS network ip
         required: true
         status: SUPPORTED
-      port_pcm_port_1_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
+      port_pcm_port_00_network_role_tag:
+        type: string
         required: true
         status: SUPPORTED
-      port_pcm_port_1_vlan_requirements:
-        type: list
+      port_pcm_port_01_order:
+        type: integer
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
       pcm_flavor_name:
         type: string
         description: flavor name of PCRF CM instance
         required: true
         status: SUPPORTED
+      port_pcm_port_00_exCP_naming:
+        type: org.openecomp.datatypes.Naming
+        required: true
+        status: SUPPORTED
+      port_pcm_port_00_order:
+        type: integer
+        required: true
+        status: SUPPORTED
+      port_pcm_port_01_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
+        required: true
+        status: SUPPORTED
       pcm_vol:
         type: string
         description: CPS Cluman Cinder Volume
         required: true
         status: SUPPORTED
-      port_pcm_port_1_ip_requirements:
+      port_pcm_port_00_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
-      port_pcm_port_0_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
-        required: true
-        status: SUPPORTED
+          type: org.openecomp.datatypes.network.VlanRequirements
       cps_net_name:
         type: string
         description: CPS network name
@@ -1630,8 +1630,8 @@ node_types:
         description: CPS network mask
         required: true
         status: SUPPORTED
-      port_pcm_port_1_order:
-        type: integer
+      port_pcm_port_01_exCP_naming:
+        type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
     attributes:
@@ -1640,14 +1640,14 @@ node_types:
         description: the pcm nova service id
         status: SUPPORTED
     requirements:
-    - dependency_pcm_port_1:
+    - dependency_pcm_port_00:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_pcm_port_1:
+    - link_pcm_port_00:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
@@ -1667,57 +1667,55 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_pcm_port_0:
+    - dependency_pcm_port_01:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_pcm_port_0:
+    - link_pcm_port_01:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
         - 1
         - 1
     capabilities:
-      network.incoming.packets.rate_pcm_port_0:
+      cpu_server_pcm:
         type: org.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_server_pcm:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_pcm_port_00:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_pcm_port_1:
+      memory_server_pcm:
         type: org.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_pcm_port_1:
+      network.incoming.packets_pcm_port_01:
         type: org.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_server_pcm:
+      disk.write.requests_server_pcm:
         type: org.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_server_pcm:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_pcm_port_01:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_pcm_port_0:
+      network.incoming.packets_pcm_port_00:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -1741,150 +1739,132 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.usage_server_pcm:
+      network.outgoing.packets.rate_pcm_port_00:
         type: org.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_server_pcm:
+      network.incoming.bytes_pcm_port_00:
         type: org.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_server_pcm:
+      network.incoming.bytes_pcm_port_01:
         type: org.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_server_pcm:
+      disk.device.usage_server_pcm:
         type: org.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.root.size_server_pcm:
+      disk.allocation_server_pcm:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.ephemeral.size_server_pcm:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      attachment_pcm_port_00:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.latency_server_pcm:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      attachment_pcm_port_01:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_pcm_port_0:
+      disk.usage_server_pcm:
         type: org.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_pcm_port_1:
+      disk.device.write.bytes_server_pcm:
         type: org.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_pcm_port_0:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        occurrences:
-        - 0
-        - UNBOUNDED
-      binding_pcm_port_1:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        occurrences:
-        - 0
-        - UNBOUNDED
-      memory.usage_server_pcm:
+      network.outgoing.bytes_pcm_port_00:
         type: org.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_server_pcm:
+      disk.root.size_server_pcm:
         type: org.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_server_pcm:
+      disk.ephemeral.size_server_pcm:
         type: org.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_server_pcm:
-        type: tosca.capabilities.OperatingSystem
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.read.bytes_server_pcm:
+      disk.device.latency_server_pcm:
         type: org.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_pcm_port_0:
+      network.outgoing.packets.rate_pcm_port_01:
         type: org.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_pcm_port_1:
+      memory.usage_server_pcm:
         type: org.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_pcm_port_1:
-        type: tosca.capabilities.Node
+      network.outgoing.bytes_pcm_port_01:
+        type: org.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_pcm_port_0:
+      disk.read.requests_server_pcm:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes_server_pcm:
+      disk.capacity_server_pcm:
         type: org.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_pcm_port_0:
-        type: tosca.capabilities.Node
+      os_server_pcm:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_pcm_port_1:
+      disk.read.bytes_server_pcm:
         type: org.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_pcm_port_0:
-        type: tosca.capabilities.Attachment
+      disk.device.read.bytes_server_pcm:
+        type: org.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_pcm_port_1:
-        type: tosca.capabilities.Attachment
+      network.incoming.bytes.rate_pcm_port_00:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
@@ -1893,6 +1873,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      network.incoming.bytes.rate_pcm_port_01:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.read.requests.rate_server_pcm:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -1946,61 +1932,75 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests.rate_server_pcm:
+      network.outgoing.bytes.rate_pcm_port_01:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes.rate_server_pcm:
+      network.incoming.packets.rate_pcm_port_01:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      host_server_pcm:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
-        occurrences:
-        - 1
-        - UNBOUNDED
-      cpu.delta_server_pcm:
+      network.incoming.packets.rate_pcm_port_00:
         type: org.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_pcm_port_1:
+      binding_pcm_port_01:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
+      disk.write.requests.rate_server_pcm:
         type: org.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_pcm_port_0:
+      binding_pcm_port_00:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
+      disk.device.write.bytes.rate_server_pcm:
         type: org.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_server_pcm:
-        type: tosca.capabilities.network.Bindable
+      host_server_pcm:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_pcm_port_0:
+      network.outgoing.bytes.rate_pcm_port_00:
         type: org.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_server_pcm:
+      cpu.delta_server_pcm:
         type: org.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_pcm_port_1:
+      binding_server_pcm:
+        type: tosca.capabilities.network.Bindable
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.capacity_server_pcm:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -2035,7 +2035,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_pcm_port_0:
+      network.outpoing.packets_pcm_port_00:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -2047,7 +2047,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_pcm_port_1:
+      network.outpoing.packets_pcm_port_01:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -5375,4 +5375,4 @@ node_types:
         type: tosca.capabilities.Node
         occurrences:
         - 1
-        - UNBOUNDED
+        - 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/oneAppearancePerPattern/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/MainServiceTemplate.yaml
index 6f11bd999a..e4577fe60e 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/MainServiceTemplate.yaml
@@ -222,32 +222,31 @@ topology_template:
       directives:
       - substitutable
       properties:
-        server_group: BE_Affinity_group
-        port_pcm_port_1_network_role_tag: oam
-        port_pcm_port_0_ip_requirements:
+        port_pcm_port_00_ip_requirements:
         - ip_version: 4
           ip_count_required:
             is_required: true
           floating_ip_count_required:
             is_required: false
+        server_group: BE_Affinity_group
         pcm_image_name:
           get_input: pcm_image_name
-        security_group_name: jsa_security_group
-        port_pcm_port_1_mac_requirements:
+        port_pcm_port_00_mac_requirements:
           mac_count_required:
             is_required: false
-        pcm_flavor_name:
-          get_input: pcm_flavor_name
-        service_template_filter:
-          substitute_service_template: nested-pcm_v0.1ServiceTemplate.yaml
-        port_pcm_port_1_ip_requirements:
+        security_group_name: jsa_security_group
+        port_pcm_port_01_ip_requirements:
         - ip_version: 4
           ip_count_required:
             is_required: true
           floating_ip_count_required:
             is_required: false
-        port_pcm_port_0_network_role_tag: cps
-        port_pcm_port_0_mac_requirements:
+        port_pcm_port_00_network_role_tag: cps
+        pcm_flavor_name:
+          get_input: pcm_flavor_name
+        service_template_filter:
+          substitute_service_template: nested-pcm_v0.1ServiceTemplate.yaml
+        port_pcm_port_01_mac_requirements:
           mac_count_required:
             is_required: false
         pcm_server_name:
@@ -255,8 +254,9 @@ topology_template:
           - pcm_server_names
           - 0
         cps_net_name: nested_network
+        port_pcm_port_01_network_role_tag: oam
       requirements:
-      - link_pcm_port_0:
+      - link_pcm_port_00:
           capability: tosca.capabilities.network.Linkable
           node: nested_network
           relationship: tosca.relationships.network.LinksTo
@@ -656,11 +656,11 @@ topology_template:
           direction: ingress
       requirements:
       - port:
-          capability: attachment_pcm_port_0
+          capability: attachment_pcm_port_00
           node: 4p_nested
           relationship: org.openecomp.relationships.AttachesTo
       - port:
-          capability: attachment_pcm_port_1
+          capability: attachment_pcm_port_01
           node: 4p_nested
           relationship: org.openecomp.relationships.AttachesTo
       - port:
@@ -844,4 +844,4 @@ topology_template:
         name: def
         affinity: host
       targets:
-      - BE_Affinity_group
+      - BE_Affinity_group
\ 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/oneAppearancePerPattern/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/nested-pcm_v0.1ServiceTemplate.yaml
index 198b4c8e9a..293a19f311 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/nested-pcm_v0.1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/nested-pcm_v0.1ServiceTemplate.yaml
@@ -11,39 +11,38 @@ 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_network_role_tag:
-      type: string
-      required: true
     availabilityzone_name:
       label: availabilityzone name
       hidden: false
       immutable: false
       type: string
       description: availabilityzone name
-    port_pcm_port_0_vlan_requirements:
-      type: list
-      required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.VlanRequirements
     pcm_image_name:
       label: image name
       hidden: false
       immutable: false
       type: string
       description: PCRF CM image name
-    port_pcm_port_0_order:
-      type: integer
+    port_pcm_port_00_mac_requirements:
+      type: org.openecomp.datatypes.network.MacRequirements
       required: true
-    port_pcm_port_0_subnetpoolid:
+    port_pcm_port_01_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.IpRequirements
+    port_pcm_port_00_subnetpoolid:
       type: string
       required: true
-    port_pcm_port_1_subnetpoolid:
+    port_pcm_port_01_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.VlanRequirements
+    port_pcm_port_01_network_role:
       type: string
       required: true
-    port_pcm_port_0_network_role_tag:
+    port_pcm_port_01_subnetpoolid:
       type: string
       required: true
     pcm_server_name:
@@ -58,30 +57,27 @@ topology_template:
       immutable: false
       type: string
       description: CPS network mask
-    port_pcm_port_1_exCP_naming:
-      type: org.openecomp.datatypes.Naming
-      required: true
-    port_pcm_port_0_exCP_naming:
-      type: org.openecomp.datatypes.Naming
-      required: true
     oam_net_name:
       label: OAM network name
       hidden: false
       immutable: false
       type: string
       description: OAM network name
-    port_pcm_port_1_network_role:
+    port_pcm_port_01_network_role_tag:
       type: string
       required: true
-    server_group:
-      hidden: false
-      immutable: false
+    port_pcm_port_00_network_role:
       type: string
-    port_pcm_port_0_ip_requirements:
+      required: true
+    port_pcm_port_00_ip_requirements:
       type: list
       required: true
       entry_schema:
         type: org.openecomp.datatypes.network.IpRequirements
+    server_group:
+      hidden: false
+      immutable: false
+      type: string
     oam_net_gw:
       label: CPS network gateway
       hidden: false
@@ -100,34 +96,38 @@ topology_template:
       immutable: false
       type: string
       description: CPS network ip
-    port_pcm_port_1_mac_requirements:
-      type: org.openecomp.datatypes.network.MacRequirements
+    port_pcm_port_00_network_role_tag:
+      type: string
       required: true
-    port_pcm_port_1_vlan_requirements:
-      type: list
+    port_pcm_port_01_order:
+      type: integer
       required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.VlanRequirements
     pcm_flavor_name:
       label: PCRF CM flavor name
       hidden: false
       immutable: false
       type: string
       description: flavor name of PCRF CM instance
+    port_pcm_port_00_exCP_naming:
+      type: org.openecomp.datatypes.Naming
+      required: true
+    port_pcm_port_00_order:
+      type: integer
+      required: true
+    port_pcm_port_01_mac_requirements:
+      type: org.openecomp.datatypes.network.MacRequirements
+      required: true
     pcm_vol:
       label: CPS Cluman Cinder Volume
       hidden: false
       immutable: false
       type: string
       description: CPS Cluman Cinder Volume
-    port_pcm_port_1_ip_requirements:
+    port_pcm_port_00_vlan_requirements:
       type: list
       required: true
       entry_schema:
-        type: org.openecomp.datatypes.network.IpRequirements
-    port_pcm_port_0_mac_requirements:
-      type: org.openecomp.datatypes.network.MacRequirements
-      required: true
+        type: org.openecomp.datatypes.network.VlanRequirements
     cps_net_name:
       label: CPS network name
       hidden: false
@@ -146,36 +146,36 @@ topology_template:
       immutable: false
       type: string
       description: CPS network mask
-    port_pcm_port_1_order:
-      type: integer
+    port_pcm_port_01_exCP_naming:
+      type: org.openecomp.datatypes.Naming
       required: true
   node_templates:
-    pcm_port_1:
+    pcm_port_00:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         ip_requirements:
-          get_input: port_pcm_port_1_ip_requirements
+          get_input: port_pcm_port_00_ip_requirements
         security_groups:
         - get_input: security_group_name
         network_role:
-          get_input: port_pcm_port_1_network_role
+          get_input: port_pcm_port_00_network_role
         fixed_ips:
         - ip_address:
-            get_input: oam_net_ip
+            get_input: cps_net_ip
         subnetpoolid:
-          get_input: port_pcm_port_1_subnetpoolid
+          get_input: port_pcm_port_00_subnetpoolid
         mac_requirements:
-          get_input: port_pcm_port_1_mac_requirements
+          get_input: port_pcm_port_00_mac_requirements
         exCP_naming:
-          get_input: port_pcm_port_1_exCP_naming
+          get_input: port_pcm_port_00_exCP_naming
         vlan_requirements:
-          get_input: port_pcm_port_1_vlan_requirements
+          get_input: port_pcm_port_00_vlan_requirements
         network_role_tag:
-          get_input: port_pcm_port_1_network_role_tag
+          get_input: port_pcm_port_00_network_role_tag
         network:
-          get_input: oam_net_name
+          get_input: cps_net_name
         order:
-          get_input: port_pcm_port_1_order
+          get_input: port_pcm_port_00_order
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
@@ -197,32 +197,32 @@ topology_template:
         scheduler_hints:
           group:
             get_input: server_group
-    pcm_port_0:
+    pcm_port_01:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         ip_requirements:
-          get_input: port_pcm_port_0_ip_requirements
+          get_input: port_pcm_port_01_ip_requirements
         security_groups:
         - get_input: security_group_name
         network_role:
-          get_input: port_pcm_port_0_network_role
+          get_input: port_pcm_port_01_network_role
         fixed_ips:
         - ip_address:
-            get_input: cps_net_ip
+            get_input: oam_net_ip
         subnetpoolid:
-          get_input: port_pcm_port_0_subnetpoolid
+          get_input: port_pcm_port_01_subnetpoolid
         mac_requirements:
-          get_input: port_pcm_port_0_mac_requirements
+          get_input: port_pcm_port_01_mac_requirements
         exCP_naming:
-          get_input: port_pcm_port_0_exCP_naming
+          get_input: port_pcm_port_01_exCP_naming
         vlan_requirements:
-          get_input: port_pcm_port_0_vlan_requirements
+          get_input: port_pcm_port_01_vlan_requirements
         network_role_tag:
-          get_input: port_pcm_port_0_network_role_tag
+          get_input: port_pcm_port_01_network_role_tag
         network:
-          get_input: cps_net_name
+          get_input: oam_net_name
         order:
-          get_input: port_pcm_port_0_order
+          get_input: port_pcm_port_01_order
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
@@ -235,9 +235,9 @@ topology_template:
         heat_file: ../Artifacts/nested-pcm_v0.1.yaml
         description: heat template that creates PCRF Cluman stack
       members:
-      - pcm_port_1
+      - pcm_port_00
       - server_pcm
-      - pcm_port_0
+      - pcm_port_01
   outputs:
     server_pcm_id:
       description: the pcm nova service id
@@ -245,27 +245,27 @@ topology_template:
   substitution_mappings:
     node_type: org.openecomp.resource.abstract.nodes.heat.pcm_server
     capabilities:
-      network.incoming.packets.rate_pcm_port_0:
-      - pcm_port_0
-      - network.incoming.packets.rate
       cpu_server_pcm:
       - server_pcm
       - cpu
-      network.incoming.packets.rate_pcm_port_1:
-      - pcm_port_1
-      - network.incoming.packets.rate
-      network.outpoing.packets_pcm_port_1:
-      - pcm_port_1
-      - network.outpoing.packets
+      feature_pcm_port_00:
+      - pcm_port_00
+      - feature
       memory_server_pcm:
       - server_pcm
       - memory
+      network.incoming.packets_pcm_port_01:
+      - pcm_port_01
+      - network.incoming.packets
       disk.write.requests_server_pcm:
       - server_pcm
       - disk.write.requests
-      network.outpoing.packets_pcm_port_0:
-      - pcm_port_0
-      - network.outpoing.packets
+      feature_pcm_port_01:
+      - pcm_port_01
+      - feature
+      network.incoming.packets_pcm_port_00:
+      - pcm_port_00
+      - network.incoming.packets
       disk.device.iops_server_pcm:
       - server_pcm
       - disk.device.iops
@@ -275,18 +275,36 @@ topology_template:
       disk.device.write.requests_server_pcm:
       - server_pcm
       - disk.device.write.requests
+      network.outgoing.packets.rate_pcm_port_00:
+      - pcm_port_00
+      - network.outgoing.packets.rate
+      network.incoming.bytes_pcm_port_00:
+      - pcm_port_00
+      - network.incoming.bytes
+      network.incoming.bytes_pcm_port_01:
+      - pcm_port_01
+      - network.incoming.bytes
       disk.device.usage_server_pcm:
       - server_pcm
       - disk.device.usage
       disk.allocation_server_pcm:
       - server_pcm
       - disk.allocation
+      attachment_pcm_port_00:
+      - pcm_port_00
+      - attachment
+      attachment_pcm_port_01:
+      - pcm_port_01
+      - attachment
       disk.usage_server_pcm:
       - server_pcm
       - disk.usage
       disk.device.write.bytes_server_pcm:
       - server_pcm
       - disk.device.write.bytes
+      network.outgoing.bytes_pcm_port_00:
+      - pcm_port_00
+      - network.outgoing.bytes
       disk.root.size_server_pcm:
       - server_pcm
       - disk.root.size
@@ -296,21 +314,15 @@ topology_template:
       disk.device.latency_server_pcm:
       - server_pcm
       - disk.device.latency
-      network.incoming.bytes_pcm_port_0:
-      - pcm_port_0
-      - network.incoming.bytes
-      network.incoming.bytes_pcm_port_1:
-      - pcm_port_1
-      - network.incoming.bytes
-      binding_pcm_port_0:
-      - pcm_port_0
-      - binding
-      binding_pcm_port_1:
-      - pcm_port_1
-      - binding
+      network.outgoing.packets.rate_pcm_port_01:
+      - pcm_port_01
+      - network.outgoing.packets.rate
       memory.usage_server_pcm:
       - server_pcm
       - memory.usage
+      network.outgoing.bytes_pcm_port_01:
+      - pcm_port_01
+      - network.outgoing.bytes
       disk.read.requests_server_pcm:
       - server_pcm
       - disk.read.requests
@@ -323,36 +335,18 @@ topology_template:
       disk.read.bytes_server_pcm:
       - server_pcm
       - disk.read.bytes
-      network.outgoing.packets.rate_pcm_port_0:
-      - pcm_port_0
-      - network.outgoing.packets.rate
-      network.outgoing.packets.rate_pcm_port_1:
-      - pcm_port_1
-      - network.outgoing.packets.rate
-      feature_pcm_port_1:
-      - pcm_port_1
-      - feature
-      network.outgoing.bytes_pcm_port_0:
-      - pcm_port_0
-      - network.outgoing.bytes
       disk.device.read.bytes_server_pcm:
       - server_pcm
       - disk.device.read.bytes
-      feature_pcm_port_0:
-      - pcm_port_0
-      - feature
-      network.outgoing.bytes_pcm_port_1:
-      - pcm_port_1
-      - network.outgoing.bytes
-      attachment_pcm_port_0:
-      - pcm_port_0
-      - attachment
-      attachment_pcm_port_1:
-      - pcm_port_1
-      - attachment
+      network.incoming.bytes.rate_pcm_port_00:
+      - pcm_port_00
+      - network.incoming.bytes.rate
       endpoint_server_pcm:
       - server_pcm
       - endpoint
+      network.incoming.bytes.rate_pcm_port_01:
+      - pcm_port_01
+      - network.incoming.bytes.rate
       disk.device.read.requests.rate_server_pcm:
       - server_pcm
       - disk.device.read.requests.rate
@@ -380,36 +374,42 @@ topology_template:
       cpu_util_server_pcm:
       - server_pcm
       - cpu_util
+      network.outgoing.bytes.rate_pcm_port_01:
+      - pcm_port_01
+      - network.outgoing.bytes.rate
+      network.incoming.packets.rate_pcm_port_01:
+      - pcm_port_01
+      - network.incoming.packets.rate
+      network.incoming.packets.rate_pcm_port_00:
+      - pcm_port_00
+      - network.incoming.packets.rate
+      binding_pcm_port_01:
+      - pcm_port_01
+      - binding
       disk.write.requests.rate_server_pcm:
       - server_pcm
       - disk.write.requests.rate
+      binding_pcm_port_00:
+      - pcm_port_00
+      - binding
       disk.device.write.bytes.rate_server_pcm:
       - server_pcm
       - disk.device.write.bytes.rate
       host_server_pcm:
       - server_pcm
       - host
+      network.outgoing.bytes.rate_pcm_port_00:
+      - pcm_port_00
+      - network.outgoing.bytes.rate
       cpu.delta_server_pcm:
       - server_pcm
       - cpu.delta
-      network.outgoing.bytes.rate_pcm_port_1:
-      - pcm_port_1
-      - network.outgoing.bytes.rate
-      network.incoming.packets_pcm_port_0:
-      - pcm_port_0
-      - network.incoming.packets
       binding_server_pcm:
       - server_pcm
       - binding
-      network.outgoing.bytes.rate_pcm_port_0:
-      - pcm_port_0
-      - network.outgoing.bytes.rate
       disk.device.capacity_server_pcm:
       - server_pcm
       - disk.device.capacity
-      network.incoming.packets_pcm_port_1:
-      - pcm_port_1
-      - network.incoming.packets
       instance_server_pcm:
       - server_pcm
       - instance
@@ -425,31 +425,31 @@ topology_template:
       feature_server_pcm:
       - server_pcm
       - feature
-      network.incoming.bytes.rate_pcm_port_0:
-      - pcm_port_0
-      - network.incoming.bytes.rate
+      network.outpoing.packets_pcm_port_00:
+      - pcm_port_00
+      - network.outpoing.packets
       disk.write.bytes.rate_server_pcm:
       - server_pcm
       - disk.write.bytes.rate
-      network.incoming.bytes.rate_pcm_port_1:
-      - pcm_port_1
-      - network.incoming.bytes.rate
+      network.outpoing.packets_pcm_port_01:
+      - pcm_port_01
+      - network.outpoing.packets
     requirements:
-      link_pcm_port_0:
-      - pcm_port_0
-      - link
-      link_pcm_port_1:
-      - pcm_port_1
-      - link
+      dependency_pcm_port_00:
+      - pcm_port_00
+      - dependency
       local_storage_server_pcm:
       - server_pcm
       - local_storage
-      dependency_pcm_port_0:
-      - pcm_port_0
+      dependency_pcm_port_01:
+      - pcm_port_01
       - dependency
+      link_pcm_port_01:
+      - pcm_port_01
+      - link
+      link_pcm_port_00:
+      - pcm_port_00
+      - link
       dependency_server_pcm:
       - server_pcm
-      - dependency
-      dependency_pcm_port_1:
-      - pcm_port_1
-      - dependency
+      - dependency
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/in/nested-pcm_v0.1.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/in/nested-pcm_v0.1.yaml
index b6b85785cd..b08c486d85 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/in/nested-pcm_v0.1.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/in/nested-pcm_v0.1.yaml
@@ -71,15 +71,15 @@ resources:
       flavor: { get_param: pcm_flavor_name }
       availability_zone: { get_param: availabilityzone_name }
       networks:
-        - port: { get_resource: pcm_port_0}
-        - port: { get_resource: pcm_port_1}
+        - port: { get_resource: pcm_port_00}
+        - port: { get_resource: pcm_port_01}
       block_device_mapping:
         - device_name: vdb
           volume_id: { get_param: pcm_vol}
       user_data_format: RAW
       scheduler_hints: { group: { get_param: server_group }  }
 
-  pcm_port_0:
+  pcm_port_00:
     type: OS::Neutron::Port
     properties:
       network: { get_param: cps_net_name }
@@ -87,7 +87,7 @@ resources:
         - ip_address: { get_param: cps_net_ip }
       security_groups: [{ get_param: security_group_name }]
 
-  pcm_port_1:
+  pcm_port_01:
     type: OS::Neutron::Port
     properties:
       network: { get_param: oam_net_name }
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 40d6c556fa..963fe97ca1 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -1366,43 +1366,41 @@ node_types:
   org.openecomp.resource.abstract.nodes.heat.pcm_server_1:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
-      port_pcm_port_0_network_role:
+      availabilityzone_name:
         type: string
+        description: availabilityzone name
         required: true
         status: SUPPORTED
-      port_pcm_port_1_network_role_tag:
+      pcm_image_name:
         type: string
+        description: PCRF CM image name
         required: true
         status: SUPPORTED
-      availabilityzone_name:
-        type: string
-        description: availabilityzone name
+      port_pcm_port_00_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
         required: true
         status: SUPPORTED
-      port_pcm_port_0_vlan_requirements:
+      port_pcm_port_01_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
-      pcm_image_name:
+          type: org.openecomp.datatypes.network.IpRequirements
+      port_pcm_port_00_subnetpoolid:
         type: string
-        description: PCRF CM image name
         required: true
         status: SUPPORTED
-      port_pcm_port_0_order:
-        type: integer
-        required: true
-        status: SUPPORTED
-      port_pcm_port_0_subnetpoolid:
-        type: string
+      port_pcm_port_01_vlan_requirements:
+        type: list
         required: true
         status: SUPPORTED
-      port_pcm_port_1_subnetpoolid:
+        entry_schema:
+          type: org.openecomp.datatypes.network.VlanRequirements
+      port_pcm_port_01_network_role:
         type: string
         required: true
         status: SUPPORTED
-      port_pcm_port_0_network_role_tag:
+      port_pcm_port_01_subnetpoolid:
         type: string
         required: true
         status: SUPPORTED
@@ -1416,23 +1414,25 @@ node_types:
         description: CPS network mask
         required: true
         status: SUPPORTED
-      port_pcm_port_1_exCP_naming:
-        type: org.openecomp.datatypes.Naming
+      oam_net_name:
+        type: string
+        description: OAM network name
         required: true
         status: SUPPORTED
-      port_pcm_port_0_exCP_naming:
-        type: org.openecomp.datatypes.Naming
+      port_pcm_port_01_network_role_tag:
+        type: string
         required: true
         status: SUPPORTED
-      oam_net_name:
+      port_pcm_port_00_network_role:
         type: string
-        description: OAM network name
         required: true
         status: SUPPORTED
-      port_pcm_port_1_network_role:
-        type: string
+      port_pcm_port_00_ip_requirements:
+        type: list
         required: true
         status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.IpRequirements
       server_group:
         type: string
         required: true
@@ -1441,12 +1441,6 @@ node_types:
         type: json
         required: true
         status: SUPPORTED
-      port_pcm_port_0_ip_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
       oam_net_gw:
         type: string
         description: CPS network gateway
@@ -1462,36 +1456,42 @@ node_types:
         description: CPS network ip
         required: true
         status: SUPPORTED
-      port_pcm_port_1_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
+      port_pcm_port_00_network_role_tag:
+        type: string
         required: true
         status: SUPPORTED
-      port_pcm_port_1_vlan_requirements:
-        type: list
+      port_pcm_port_01_order:
+        type: integer
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
       pcm_flavor_name:
         type: string
         description: flavor name of PCRF CM instance
         required: true
         status: SUPPORTED
+      port_pcm_port_00_exCP_naming:
+        type: org.openecomp.datatypes.Naming
+        required: true
+        status: SUPPORTED
+      port_pcm_port_00_order:
+        type: integer
+        required: true
+        status: SUPPORTED
+      port_pcm_port_01_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
+        required: true
+        status: SUPPORTED
       pcm_vol:
         type: string
         description: CPS Cluman Cinder Volume
         required: true
         status: SUPPORTED
-      port_pcm_port_1_ip_requirements:
+      port_pcm_port_00_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
-      port_pcm_port_0_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
-        required: true
-        status: SUPPORTED
+          type: org.openecomp.datatypes.network.VlanRequirements
       cps_net_name:
         type: string
         description: CPS network name
@@ -1507,8 +1507,8 @@ node_types:
         description: CPS network mask
         required: true
         status: SUPPORTED
-      port_pcm_port_1_order:
-        type: integer
+      port_pcm_port_01_exCP_naming:
+        type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
     attributes:
@@ -1517,14 +1517,14 @@ node_types:
         description: the pcm nova service id
         status: SUPPORTED
     requirements:
-    - dependency_pcm_port_1:
+    - dependency_pcm_port_00:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_pcm_port_1:
+    - link_pcm_port_00:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
@@ -1544,57 +1544,55 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_pcm_port_0:
+    - dependency_pcm_port_01:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_pcm_port_0:
+    - link_pcm_port_01:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
         - 1
         - 1
     capabilities:
-      network.incoming.packets.rate_pcm_port_0:
+      cpu_server_pcm:
         type: org.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_server_pcm:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_pcm_port_00:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_pcm_port_1:
+      memory_server_pcm:
         type: org.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_pcm_port_1:
+      network.incoming.packets_pcm_port_01:
         type: org.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_server_pcm:
+      disk.write.requests_server_pcm:
         type: org.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_server_pcm:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_pcm_port_01:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_pcm_port_0:
+      network.incoming.packets_pcm_port_00:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -1618,150 +1616,132 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.usage_server_pcm:
+      network.outgoing.packets.rate_pcm_port_00:
         type: org.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_server_pcm:
+      network.incoming.bytes_pcm_port_00:
         type: org.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_server_pcm:
+      network.incoming.bytes_pcm_port_01:
         type: org.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_server_pcm:
+      disk.device.usage_server_pcm:
         type: org.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.root.size_server_pcm:
+      disk.allocation_server_pcm:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.ephemeral.size_server_pcm:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      attachment_pcm_port_00:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.latency_server_pcm:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      attachment_pcm_port_01:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_pcm_port_0:
+      disk.usage_server_pcm:
         type: org.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_pcm_port_1:
+      disk.device.write.bytes_server_pcm:
         type: org.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_pcm_port_0:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        occurrences:
-        - 0
-        - UNBOUNDED
-      binding_pcm_port_1:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        occurrences:
-        - 0
-        - UNBOUNDED
-      memory.usage_server_pcm:
+      network.outgoing.bytes_pcm_port_00:
         type: org.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_server_pcm:
+      disk.root.size_server_pcm:
         type: org.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_server_pcm:
+      disk.ephemeral.size_server_pcm:
         type: org.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_server_pcm:
-        type: tosca.capabilities.OperatingSystem
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.read.bytes_server_pcm:
+      disk.device.latency_server_pcm:
         type: org.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_pcm_port_0:
+      network.outgoing.packets.rate_pcm_port_01:
         type: org.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_pcm_port_1:
+      memory.usage_server_pcm:
         type: org.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_pcm_port_1:
-        type: tosca.capabilities.Node
+      network.outgoing.bytes_pcm_port_01:
+        type: org.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_pcm_port_0:
+      disk.read.requests_server_pcm:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes_server_pcm:
+      disk.capacity_server_pcm:
         type: org.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_pcm_port_0:
-        type: tosca.capabilities.Node
+      os_server_pcm:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_pcm_port_1:
+      disk.read.bytes_server_pcm:
         type: org.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_pcm_port_0:
-        type: tosca.capabilities.Attachment
+      disk.device.read.bytes_server_pcm:
+        type: org.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_pcm_port_1:
-        type: tosca.capabilities.Attachment
+      network.incoming.bytes.rate_pcm_port_00:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
@@ -1770,6 +1750,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      network.incoming.bytes.rate_pcm_port_01:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.read.requests.rate_server_pcm:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -1823,61 +1809,75 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests.rate_server_pcm:
+      network.outgoing.bytes.rate_pcm_port_01:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes.rate_server_pcm:
+      network.incoming.packets.rate_pcm_port_01:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      host_server_pcm:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
-        occurrences:
-        - 1
-        - UNBOUNDED
-      cpu.delta_server_pcm:
+      network.incoming.packets.rate_pcm_port_00:
         type: org.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_pcm_port_1:
+      binding_pcm_port_01:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
+      disk.write.requests.rate_server_pcm:
         type: org.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_pcm_port_0:
+      binding_pcm_port_00:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
+      disk.device.write.bytes.rate_server_pcm:
         type: org.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_server_pcm:
-        type: tosca.capabilities.network.Bindable
+      host_server_pcm:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_pcm_port_0:
+      network.outgoing.bytes.rate_pcm_port_00:
         type: org.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_server_pcm:
+      cpu.delta_server_pcm:
         type: org.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_pcm_port_1:
+      binding_server_pcm:
+        type: tosca.capabilities.network.Bindable
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.capacity_server_pcm:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -1912,7 +1912,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_pcm_port_0:
+      network.outpoing.packets_pcm_port_00:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -1924,7 +1924,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_pcm_port_1:
+      network.outpoing.packets_pcm_port_01:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -2944,43 +2944,41 @@ node_types:
   org.openecomp.resource.abstract.nodes.heat.pcm_server:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
-      port_pcm_port_0_network_role:
+      availabilityzone_name:
         type: string
+        description: availabilityzone name
         required: true
         status: SUPPORTED
-      port_pcm_port_1_network_role_tag:
+      pcm_image_name:
         type: string
+        description: PCRF CM image name
         required: true
         status: SUPPORTED
-      availabilityzone_name:
-        type: string
-        description: availabilityzone name
+      port_pcm_port_00_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
         required: true
         status: SUPPORTED
-      port_pcm_port_0_vlan_requirements:
+      port_pcm_port_01_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
-      pcm_image_name:
+          type: org.openecomp.datatypes.network.IpRequirements
+      port_pcm_port_00_subnetpoolid:
         type: string
-        description: PCRF CM image name
         required: true
         status: SUPPORTED
-      port_pcm_port_0_order:
-        type: integer
-        required: true
-        status: SUPPORTED
-      port_pcm_port_0_subnetpoolid:
-        type: string
+      port_pcm_port_01_vlan_requirements:
+        type: list
         required: true
         status: SUPPORTED
-      port_pcm_port_1_subnetpoolid:
+        entry_schema:
+          type: org.openecomp.datatypes.network.VlanRequirements
+      port_pcm_port_01_network_role:
         type: string
         required: true
         status: SUPPORTED
-      port_pcm_port_0_network_role_tag:
+      port_pcm_port_01_subnetpoolid:
         type: string
         required: true
         status: SUPPORTED
@@ -2994,23 +2992,25 @@ node_types:
         description: CPS network mask
         required: true
         status: SUPPORTED
-      port_pcm_port_1_exCP_naming:
-        type: org.openecomp.datatypes.Naming
+      oam_net_name:
+        type: string
+        description: OAM network name
         required: true
         status: SUPPORTED
-      port_pcm_port_0_exCP_naming:
-        type: org.openecomp.datatypes.Naming
+      port_pcm_port_01_network_role_tag:
+        type: string
         required: true
         status: SUPPORTED
-      oam_net_name:
+      port_pcm_port_00_network_role:
         type: string
-        description: OAM network name
         required: true
         status: SUPPORTED
-      port_pcm_port_1_network_role:
-        type: string
+      port_pcm_port_00_ip_requirements:
+        type: list
         required: true
         status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.IpRequirements
       server_group:
         type: string
         required: true
@@ -3019,12 +3019,6 @@ node_types:
         type: json
         required: true
         status: SUPPORTED
-      port_pcm_port_0_ip_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
       oam_net_gw:
         type: string
         description: CPS network gateway
@@ -3040,36 +3034,42 @@ node_types:
         description: CPS network ip
         required: true
         status: SUPPORTED
-      port_pcm_port_1_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
+      port_pcm_port_00_network_role_tag:
+        type: string
         required: true
         status: SUPPORTED
-      port_pcm_port_1_vlan_requirements:
-        type: list
+      port_pcm_port_01_order:
+        type: integer
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
       pcm_flavor_name:
         type: string
         description: flavor name of PCRF CM instance
         required: true
         status: SUPPORTED
+      port_pcm_port_00_exCP_naming:
+        type: org.openecomp.datatypes.Naming
+        required: true
+        status: SUPPORTED
+      port_pcm_port_00_order:
+        type: integer
+        required: true
+        status: SUPPORTED
+      port_pcm_port_01_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
+        required: true
+        status: SUPPORTED
       pcm_vol:
         type: string
         description: CPS Cluman Cinder Volume
         required: true
         status: SUPPORTED
-      port_pcm_port_1_ip_requirements:
+      port_pcm_port_00_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
-      port_pcm_port_0_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
-        required: true
-        status: SUPPORTED
+          type: org.openecomp.datatypes.network.VlanRequirements
       cps_net_name:
         type: string
         description: CPS network name
@@ -3085,8 +3085,8 @@ node_types:
         description: CPS network mask
         required: true
         status: SUPPORTED
-      port_pcm_port_1_order:
-        type: integer
+      port_pcm_port_01_exCP_naming:
+        type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
     attributes:
@@ -3095,14 +3095,14 @@ node_types:
         description: the pcm nova service id
         status: SUPPORTED
     requirements:
-    - dependency_pcm_port_1:
+    - dependency_pcm_port_00:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_pcm_port_1:
+    - link_pcm_port_00:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
@@ -3122,57 +3122,55 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_pcm_port_0:
+    - dependency_pcm_port_01:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_pcm_port_0:
+    - link_pcm_port_01:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
         - 1
         - 1
     capabilities:
-      network.incoming.packets.rate_pcm_port_0:
+      cpu_server_pcm:
         type: org.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_server_pcm:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_pcm_port_00:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_pcm_port_1:
+      memory_server_pcm:
         type: org.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_pcm_port_1:
+      network.incoming.packets_pcm_port_01:
         type: org.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_server_pcm:
+      disk.write.requests_server_pcm:
         type: org.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_server_pcm:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_pcm_port_01:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_pcm_port_0:
+      network.incoming.packets_pcm_port_00:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -3196,150 +3194,132 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.usage_server_pcm:
+      network.outgoing.packets.rate_pcm_port_00:
         type: org.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_server_pcm:
+      network.incoming.bytes_pcm_port_00:
         type: org.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_server_pcm:
+      network.incoming.bytes_pcm_port_01:
         type: org.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_server_pcm:
+      disk.device.usage_server_pcm:
         type: org.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.root.size_server_pcm:
+      disk.allocation_server_pcm:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.ephemeral.size_server_pcm:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      attachment_pcm_port_00:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.latency_server_pcm:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      attachment_pcm_port_01:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_pcm_port_0:
+      disk.usage_server_pcm:
         type: org.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_pcm_port_1:
+      disk.device.write.bytes_server_pcm:
         type: org.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_pcm_port_0:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        occurrences:
-        - 0
-        - UNBOUNDED
-      binding_pcm_port_1:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        occurrences:
-        - 0
-        - UNBOUNDED
-      memory.usage_server_pcm:
+      network.outgoing.bytes_pcm_port_00:
         type: org.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_server_pcm:
+      disk.root.size_server_pcm:
         type: org.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_server_pcm:
+      disk.ephemeral.size_server_pcm:
         type: org.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_server_pcm:
-        type: tosca.capabilities.OperatingSystem
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.read.bytes_server_pcm:
+      disk.device.latency_server_pcm:
         type: org.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_pcm_port_0:
+      network.outgoing.packets.rate_pcm_port_01:
         type: org.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_pcm_port_1:
+      memory.usage_server_pcm:
         type: org.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_pcm_port_1:
-        type: tosca.capabilities.Node
+      network.outgoing.bytes_pcm_port_01:
+        type: org.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_pcm_port_0:
+      disk.read.requests_server_pcm:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes_server_pcm:
+      disk.capacity_server_pcm:
         type: org.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_pcm_port_0:
-        type: tosca.capabilities.Node
+      os_server_pcm:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_pcm_port_1:
+      disk.read.bytes_server_pcm:
         type: org.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_pcm_port_0:
-        type: tosca.capabilities.Attachment
+      disk.device.read.bytes_server_pcm:
+        type: org.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_pcm_port_1:
-        type: tosca.capabilities.Attachment
+      network.incoming.bytes.rate_pcm_port_00:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
@@ -3348,6 +3328,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      network.incoming.bytes.rate_pcm_port_01:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.read.requests.rate_server_pcm:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -3401,61 +3387,75 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests.rate_server_pcm:
+      network.outgoing.bytes.rate_pcm_port_01:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes.rate_server_pcm:
+      network.incoming.packets.rate_pcm_port_01:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      host_server_pcm:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
-        occurrences:
-        - 1
-        - UNBOUNDED
-      cpu.delta_server_pcm:
+      network.incoming.packets.rate_pcm_port_00:
         type: org.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_pcm_port_1:
+      binding_pcm_port_01:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
+      disk.write.requests.rate_server_pcm:
         type: org.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_pcm_port_0:
+      binding_pcm_port_00:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
+      disk.device.write.bytes.rate_server_pcm:
         type: org.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_server_pcm:
-        type: tosca.capabilities.network.Bindable
+      host_server_pcm:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_pcm_port_0:
+      network.outgoing.bytes.rate_pcm_port_00:
         type: org.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_server_pcm:
+      cpu.delta_server_pcm:
         type: org.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_pcm_port_1:
+      binding_server_pcm:
+        type: tosca.capabilities.network.Bindable
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.capacity_server_pcm:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -3490,7 +3490,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_pcm_port_0:
+      network.outpoing.packets_pcm_port_00:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -3502,7 +3502,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_pcm_port_1:
+      network.outpoing.packets_pcm_port_01:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -8354,4 +8354,4 @@ node_types:
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
-        - UNBOUNDED
+        - 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/twoAppearancePerPatternWithConnectivities/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/MainServiceTemplate.yaml
index b9c3a5fd45..4c55b814b8 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/MainServiceTemplate.yaml
@@ -1072,19 +1072,19 @@ topology_template:
           direction: ingress
       requirements:
       - port:
-          capability: attachment_pcm_port_0
+          capability: attachment_pcm_port_00
           node: 4p_nested_1
           relationship: org.openecomp.relationships.AttachesTo
       - port:
-          capability: attachment_pcm_port_1
+          capability: attachment_pcm_port_01
           node: 4p_nested_1
           relationship: org.openecomp.relationships.AttachesTo
       - port:
-          capability: attachment_pcm_port_0
+          capability: attachment_pcm_port_00
           node: 4p_nested_2
           relationship: org.openecomp.relationships.AttachesTo
       - port:
-          capability: attachment_pcm_port_1
+          capability: attachment_pcm_port_01
           node: 4p_nested_2
           relationship: org.openecomp.relationships.AttachesTo
       - port:
@@ -1437,8 +1437,13 @@ topology_template:
       directives:
       - substitutable
       properties:
+        port_pcm_port_00_ip_requirements:
+        - ip_version: 4
+          ip_count_required:
+            is_required: true
+          floating_ip_count_required:
+            is_required: false
         server_group: BE_Affinity_group
-        port_pcm_port_1_network_role_tag: oam
         connectivityChk:
           connectivityTo1C1_T1_02:
             get_attribute:
@@ -1508,30 +1513,24 @@ topology_template:
             get_attribute:
             - 1c201_catalog_instance_1C22
             - instance_name
-        port_pcm_port_0_ip_requirements:
-        - ip_version: 4
-          ip_count_required:
-            is_required: true
-          floating_ip_count_required:
-            is_required: false
         pcm_image_name:
           get_input: pcm_image_name
-        security_group_name: jsa_security_group
-        port_pcm_port_1_mac_requirements:
+        port_pcm_port_00_mac_requirements:
           mac_count_required:
             is_required: false
-        pcm_flavor_name:
-          get_input: pcm_flavor_name
-        service_template_filter:
-          substitute_service_template: nested-pcm_v0.1ServiceTemplate.yaml
-        port_pcm_port_1_ip_requirements:
+        security_group_name: jsa_security_group
+        port_pcm_port_01_ip_requirements:
         - ip_version: 4
           ip_count_required:
             is_required: true
           floating_ip_count_required:
             is_required: false
-        port_pcm_port_0_network_role_tag: cps
-        port_pcm_port_0_mac_requirements:
+        port_pcm_port_00_network_role_tag: cps
+        pcm_flavor_name:
+          get_input: pcm_flavor_name
+        service_template_filter:
+          substitute_service_template: nested-pcm_v0.1ServiceTemplate.yaml
+        port_pcm_port_01_mac_requirements:
           mac_count_required:
             is_required: false
         pcm_server_name:
@@ -1539,8 +1538,9 @@ topology_template:
           - pcm_server_names
           - 0
         cps_net_name: nested_network
+        port_pcm_port_01_network_role_tag: oam
       requirements:
-      - link_pcm_port_0:
+      - link_pcm_port_00:
           capability: tosca.capabilities.network.Linkable
           node: nested_network
           relationship: tosca.relationships.network.LinksTo
@@ -1570,8 +1570,13 @@ topology_template:
       directives:
       - substitutable
       properties:
+        port_pcm_port_00_ip_requirements:
+        - ip_version: 4
+          ip_count_required:
+            is_required: true
+          floating_ip_count_required:
+            is_required: false
         server_group: BE_Affinity_group
-        port_pcm_port_1_network_role_tag: oam
         connectivityChk:
           connectivityTo4PNested_2:
             get_attribute:
@@ -1641,30 +1646,24 @@ topology_template:
             get_attribute:
             - 1c201_catalog_instance_1C22
             - instance_name
-        port_pcm_port_0_ip_requirements:
-        - ip_version: 4
-          ip_count_required:
-            is_required: true
-          floating_ip_count_required:
-            is_required: false
         pcm_image_name:
           get_input: pcm_image_name
-        security_group_name: jsa_security_group
-        port_pcm_port_1_mac_requirements:
+        port_pcm_port_00_mac_requirements:
           mac_count_required:
             is_required: false
-        pcm_flavor_name:
-          get_input: pcm_flavor_name
-        service_template_filter:
-          substitute_service_template: nested-pcm_v0.1ServiceTemplate.yaml
-        port_pcm_port_1_ip_requirements:
+        security_group_name: jsa_security_group
+        port_pcm_port_01_ip_requirements:
         - ip_version: 4
           ip_count_required:
             is_required: true
           floating_ip_count_required:
             is_required: false
-        port_pcm_port_0_network_role_tag: cps
-        port_pcm_port_0_mac_requirements:
+        port_pcm_port_00_network_role_tag: cps
+        pcm_flavor_name:
+          get_input: pcm_flavor_name
+        service_template_filter:
+          substitute_service_template: nested-pcm_v0.1ServiceTemplate.yaml
+        port_pcm_port_01_mac_requirements:
           mac_count_required:
             is_required: false
         pcm_server_name:
@@ -1672,8 +1671,9 @@ topology_template:
           - pcm_server_names
           - 0
         cps_net_name: nested_network
+        port_pcm_port_01_network_role_tag: oam
       requirements:
-      - link_pcm_port_0:
+      - link_pcm_port_00:
           capability: tosca.capabilities.network.Linkable
           node: nested_network
           relationship: tosca.relationships.network.LinksTo
@@ -1950,4 +1950,4 @@ topology_template:
         name: def
         affinity: host
       targets:
-      - BE_Affinity_group
+      - BE_Affinity_group
\ 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/twoAppearancePerPatternWithConnectivities/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/nested-pcm_v0.1ServiceTemplate.yaml
index a4746fcd72..2a2b7dcacf 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/nested-pcm_v0.1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/nested-pcm_v0.1ServiceTemplate.yaml
@@ -11,39 +11,38 @@ 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_network_role_tag:
-      type: string
-      required: true
     availabilityzone_name:
       label: availabilityzone name
       hidden: false
       immutable: false
       type: string
       description: availabilityzone name
-    port_pcm_port_0_vlan_requirements:
-      type: list
-      required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.VlanRequirements
     pcm_image_name:
       label: image name
       hidden: false
       immutable: false
       type: string
       description: PCRF CM image name
-    port_pcm_port_0_order:
-      type: integer
+    port_pcm_port_00_mac_requirements:
+      type: org.openecomp.datatypes.network.MacRequirements
       required: true
-    port_pcm_port_0_subnetpoolid:
+    port_pcm_port_01_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.IpRequirements
+    port_pcm_port_00_subnetpoolid:
       type: string
       required: true
-    port_pcm_port_1_subnetpoolid:
+    port_pcm_port_01_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.VlanRequirements
+    port_pcm_port_01_network_role:
       type: string
       required: true
-    port_pcm_port_0_network_role_tag:
+    port_pcm_port_01_subnetpoolid:
       type: string
       required: true
     pcm_server_name:
@@ -58,21 +57,23 @@ topology_template:
       immutable: false
       type: string
       description: CPS network mask
-    port_pcm_port_1_exCP_naming:
-      type: org.openecomp.datatypes.Naming
-      required: true
-    port_pcm_port_0_exCP_naming:
-      type: org.openecomp.datatypes.Naming
-      required: true
     oam_net_name:
       label: OAM network name
       hidden: false
       immutable: false
       type: string
       description: OAM network name
-    port_pcm_port_1_network_role:
+    port_pcm_port_01_network_role_tag:
+      type: string
+      required: true
+    port_pcm_port_00_network_role:
       type: string
       required: true
+    port_pcm_port_00_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.IpRequirements
     server_group:
       hidden: false
       immutable: false
@@ -81,11 +82,6 @@ topology_template:
       hidden: false
       immutable: false
       type: json
-    port_pcm_port_0_ip_requirements:
-      type: list
-      required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.IpRequirements
     oam_net_gw:
       label: CPS network gateway
       hidden: false
@@ -104,34 +100,38 @@ topology_template:
       immutable: false
       type: string
       description: CPS network ip
-    port_pcm_port_1_mac_requirements:
-      type: org.openecomp.datatypes.network.MacRequirements
+    port_pcm_port_00_network_role_tag:
+      type: string
       required: true
-    port_pcm_port_1_vlan_requirements:
-      type: list
+    port_pcm_port_01_order:
+      type: integer
       required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.VlanRequirements
     pcm_flavor_name:
       label: PCRF CM flavor name
       hidden: false
       immutable: false
       type: string
       description: flavor name of PCRF CM instance
+    port_pcm_port_00_exCP_naming:
+      type: org.openecomp.datatypes.Naming
+      required: true
+    port_pcm_port_00_order:
+      type: integer
+      required: true
+    port_pcm_port_01_mac_requirements:
+      type: org.openecomp.datatypes.network.MacRequirements
+      required: true
     pcm_vol:
       label: CPS Cluman Cinder Volume
       hidden: false
       immutable: false
       type: string
       description: CPS Cluman Cinder Volume
-    port_pcm_port_1_ip_requirements:
+    port_pcm_port_00_vlan_requirements:
       type: list
       required: true
       entry_schema:
-        type: org.openecomp.datatypes.network.IpRequirements
-    port_pcm_port_0_mac_requirements:
-      type: org.openecomp.datatypes.network.MacRequirements
-      required: true
+        type: org.openecomp.datatypes.network.VlanRequirements
     cps_net_name:
       label: CPS network name
       hidden: false
@@ -150,36 +150,36 @@ topology_template:
       immutable: false
       type: string
       description: CPS network mask
-    port_pcm_port_1_order:
-      type: integer
+    port_pcm_port_01_exCP_naming:
+      type: org.openecomp.datatypes.Naming
       required: true
   node_templates:
-    pcm_port_1:
+    pcm_port_00:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         ip_requirements:
-          get_input: port_pcm_port_1_ip_requirements
+          get_input: port_pcm_port_00_ip_requirements
         security_groups:
         - get_input: security_group_name
         network_role:
-          get_input: port_pcm_port_1_network_role
+          get_input: port_pcm_port_00_network_role
         fixed_ips:
         - ip_address:
-            get_input: oam_net_ip
+            get_input: cps_net_ip
         subnetpoolid:
-          get_input: port_pcm_port_1_subnetpoolid
+          get_input: port_pcm_port_00_subnetpoolid
         mac_requirements:
-          get_input: port_pcm_port_1_mac_requirements
+          get_input: port_pcm_port_00_mac_requirements
         exCP_naming:
-          get_input: port_pcm_port_1_exCP_naming
+          get_input: port_pcm_port_00_exCP_naming
         vlan_requirements:
-          get_input: port_pcm_port_1_vlan_requirements
+          get_input: port_pcm_port_00_vlan_requirements
         network_role_tag:
-          get_input: port_pcm_port_1_network_role_tag
+          get_input: port_pcm_port_00_network_role_tag
         network:
-          get_input: oam_net_name
+          get_input: cps_net_name
         order:
-          get_input: port_pcm_port_1_order
+          get_input: port_pcm_port_00_order
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
@@ -201,32 +201,32 @@ topology_template:
         scheduler_hints:
           group:
             get_input: server_group
-    pcm_port_0:
+    pcm_port_01:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         ip_requirements:
-          get_input: port_pcm_port_0_ip_requirements
+          get_input: port_pcm_port_01_ip_requirements
         security_groups:
         - get_input: security_group_name
         network_role:
-          get_input: port_pcm_port_0_network_role
+          get_input: port_pcm_port_01_network_role
         fixed_ips:
         - ip_address:
-            get_input: cps_net_ip
+            get_input: oam_net_ip
         subnetpoolid:
-          get_input: port_pcm_port_0_subnetpoolid
+          get_input: port_pcm_port_01_subnetpoolid
         mac_requirements:
-          get_input: port_pcm_port_0_mac_requirements
+          get_input: port_pcm_port_01_mac_requirements
         exCP_naming:
-          get_input: port_pcm_port_0_exCP_naming
+          get_input: port_pcm_port_01_exCP_naming
         vlan_requirements:
-          get_input: port_pcm_port_0_vlan_requirements
+          get_input: port_pcm_port_01_vlan_requirements
         network_role_tag:
-          get_input: port_pcm_port_0_network_role_tag
+          get_input: port_pcm_port_01_network_role_tag
         network:
-          get_input: cps_net_name
+          get_input: oam_net_name
         order:
-          get_input: port_pcm_port_0_order
+          get_input: port_pcm_port_01_order
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
@@ -239,9 +239,9 @@ topology_template:
         heat_file: ../Artifacts/nested-pcm_v0.1.yaml
         description: heat template that creates PCRF Cluman stack
       members:
-      - pcm_port_1
+      - pcm_port_00
       - server_pcm
-      - pcm_port_0
+      - pcm_port_01
   outputs:
     server_pcm_id:
       description: the pcm nova service id
@@ -249,27 +249,27 @@ topology_template:
   substitution_mappings:
     node_type: org.openecomp.resource.abstract.nodes.heat.pcm_server
     capabilities:
-      network.incoming.packets.rate_pcm_port_0:
-      - pcm_port_0
-      - network.incoming.packets.rate
       cpu_server_pcm:
       - server_pcm
       - cpu
-      network.incoming.packets.rate_pcm_port_1:
-      - pcm_port_1
-      - network.incoming.packets.rate
-      network.outpoing.packets_pcm_port_1:
-      - pcm_port_1
-      - network.outpoing.packets
+      feature_pcm_port_00:
+      - pcm_port_00
+      - feature
       memory_server_pcm:
       - server_pcm
       - memory
+      network.incoming.packets_pcm_port_01:
+      - pcm_port_01
+      - network.incoming.packets
       disk.write.requests_server_pcm:
       - server_pcm
       - disk.write.requests
-      network.outpoing.packets_pcm_port_0:
-      - pcm_port_0
-      - network.outpoing.packets
+      feature_pcm_port_01:
+      - pcm_port_01
+      - feature
+      network.incoming.packets_pcm_port_00:
+      - pcm_port_00
+      - network.incoming.packets
       disk.device.iops_server_pcm:
       - server_pcm
       - disk.device.iops
@@ -279,18 +279,36 @@ topology_template:
       disk.device.write.requests_server_pcm:
       - server_pcm
       - disk.device.write.requests
+      network.outgoing.packets.rate_pcm_port_00:
+      - pcm_port_00
+      - network.outgoing.packets.rate
+      network.incoming.bytes_pcm_port_00:
+      - pcm_port_00
+      - network.incoming.bytes
+      network.incoming.bytes_pcm_port_01:
+      - pcm_port_01
+      - network.incoming.bytes
       disk.device.usage_server_pcm:
       - server_pcm
       - disk.device.usage
       disk.allocation_server_pcm:
       - server_pcm
       - disk.allocation
+      attachment_pcm_port_00:
+      - pcm_port_00
+      - attachment
+      attachment_pcm_port_01:
+      - pcm_port_01
+      - attachment
       disk.usage_server_pcm:
       - server_pcm
       - disk.usage
       disk.device.write.bytes_server_pcm:
       - server_pcm
       - disk.device.write.bytes
+      network.outgoing.bytes_pcm_port_00:
+      - pcm_port_00
+      - network.outgoing.bytes
       disk.root.size_server_pcm:
       - server_pcm
       - disk.root.size
@@ -300,21 +318,15 @@ topology_template:
       disk.device.latency_server_pcm:
       - server_pcm
       - disk.device.latency
-      network.incoming.bytes_pcm_port_0:
-      - pcm_port_0
-      - network.incoming.bytes
-      network.incoming.bytes_pcm_port_1:
-      - pcm_port_1
-      - network.incoming.bytes
-      binding_pcm_port_0:
-      - pcm_port_0
-      - binding
-      binding_pcm_port_1:
-      - pcm_port_1
-      - binding
+      network.outgoing.packets.rate_pcm_port_01:
+      - pcm_port_01
+      - network.outgoing.packets.rate
       memory.usage_server_pcm:
       - server_pcm
       - memory.usage
+      network.outgoing.bytes_pcm_port_01:
+      - pcm_port_01
+      - network.outgoing.bytes
       disk.read.requests_server_pcm:
       - server_pcm
       - disk.read.requests
@@ -327,36 +339,18 @@ topology_template:
       disk.read.bytes_server_pcm:
       - server_pcm
       - disk.read.bytes
-      network.outgoing.packets.rate_pcm_port_0:
-      - pcm_port_0
-      - network.outgoing.packets.rate
-      network.outgoing.packets.rate_pcm_port_1:
-      - pcm_port_1
-      - network.outgoing.packets.rate
-      feature_pcm_port_1:
-      - pcm_port_1
-      - feature
-      network.outgoing.bytes_pcm_port_0:
-      - pcm_port_0
-      - network.outgoing.bytes
       disk.device.read.bytes_server_pcm:
       - server_pcm
       - disk.device.read.bytes
-      feature_pcm_port_0:
-      - pcm_port_0
-      - feature
-      network.outgoing.bytes_pcm_port_1:
-      - pcm_port_1
-      - network.outgoing.bytes
-      attachment_pcm_port_0:
-      - pcm_port_0
-      - attachment
-      attachment_pcm_port_1:
-      - pcm_port_1
-      - attachment
+      network.incoming.bytes.rate_pcm_port_00:
+      - pcm_port_00
+      - network.incoming.bytes.rate
       endpoint_server_pcm:
       - server_pcm
       - endpoint
+      network.incoming.bytes.rate_pcm_port_01:
+      - pcm_port_01
+      - network.incoming.bytes.rate
       disk.device.read.requests.rate_server_pcm:
       - server_pcm
       - disk.device.read.requests.rate
@@ -384,36 +378,42 @@ topology_template:
       cpu_util_server_pcm:
       - server_pcm
       - cpu_util
+      network.outgoing.bytes.rate_pcm_port_01:
+      - pcm_port_01
+      - network.outgoing.bytes.rate
+      network.incoming.packets.rate_pcm_port_01:
+      - pcm_port_01
+      - network.incoming.packets.rate
+      network.incoming.packets.rate_pcm_port_00:
+      - pcm_port_00
+      - network.incoming.packets.rate
+      binding_pcm_port_01:
+      - pcm_port_01
+      - binding
       disk.write.requests.rate_server_pcm:
       - server_pcm
       - disk.write.requests.rate
+      binding_pcm_port_00:
+      - pcm_port_00
+      - binding
       disk.device.write.bytes.rate_server_pcm:
       - server_pcm
       - disk.device.write.bytes.rate
       host_server_pcm:
       - server_pcm
       - host
+      network.outgoing.bytes.rate_pcm_port_00:
+      - pcm_port_00
+      - network.outgoing.bytes.rate
       cpu.delta_server_pcm:
       - server_pcm
       - cpu.delta
-      network.outgoing.bytes.rate_pcm_port_1:
-      - pcm_port_1
-      - network.outgoing.bytes.rate
-      network.incoming.packets_pcm_port_0:
-      - pcm_port_0
-      - network.incoming.packets
       binding_server_pcm:
       - server_pcm
       - binding
-      network.outgoing.bytes.rate_pcm_port_0:
-      - pcm_port_0
-      - network.outgoing.bytes.rate
       disk.device.capacity_server_pcm:
       - server_pcm
       - disk.device.capacity
-      network.incoming.packets_pcm_port_1:
-      - pcm_port_1
-      - network.incoming.packets
       instance_server_pcm:
       - server_pcm
       - instance
@@ -429,31 +429,31 @@ topology_template:
       feature_server_pcm:
       - server_pcm
       - feature
-      network.incoming.bytes.rate_pcm_port_0:
-      - pcm_port_0
-      - network.incoming.bytes.rate
+      network.outpoing.packets_pcm_port_00:
+      - pcm_port_00
+      - network.outpoing.packets
       disk.write.bytes.rate_server_pcm:
       - server_pcm
       - disk.write.bytes.rate
-      network.incoming.bytes.rate_pcm_port_1:
-      - pcm_port_1
-      - network.incoming.bytes.rate
+      network.outpoing.packets_pcm_port_01:
+      - pcm_port_01
+      - network.outpoing.packets
     requirements:
-      link_pcm_port_0:
-      - pcm_port_0
-      - link
-      link_pcm_port_1:
-      - pcm_port_1
-      - link
+      dependency_pcm_port_00:
+      - pcm_port_00
+      - dependency
       local_storage_server_pcm:
       - server_pcm
       - local_storage
-      dependency_pcm_port_0:
-      - pcm_port_0
+      dependency_pcm_port_01:
+      - pcm_port_01
       - dependency
+      link_pcm_port_01:
+      - pcm_port_01
+      - link
+      link_pcm_port_00:
+      - pcm_port_00
+      - link
       dependency_server_pcm:
       - server_pcm
-      - dependency
-      dependency_pcm_port_1:
-      - pcm_port_1
-      - dependency
+      - dependency
\ No newline at end of file