Port scaling not working properly

Made changes in evaluating port naming pattern.

Change-Id: If9a3fc9c3d50fa5c4da319d2ff7d5f8ce6ca8ffe
Issue-ID: SDC-573
Signed-off-by: vempo <vitaliy.emporopulo@amdocs.com>

4 files changed, 324 insertions, 324 deletions

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml
index d8db407d94..391a1b781c 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -985,10 +985,6 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      port_pd_server_b_port_exCP_naming:
-        type: org.openecomp.datatypes.Naming
-        required: true
-        status: SUPPORTED
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
@@ -1001,17 +997,13 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
-      port_pd_server_b_port_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
-        required: true
-        status: SUPPORTED
-      port_pd_server_b_port_fixed_ips:
+      port_pd_server_1b_port_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.heat.neutron.port.FixedIps
-      port_pd_server_b_port_subnetpoolid:
+          type: org.openecomp.datatypes.network.VlanRequirements
+      port_pd_server_1b_port_network_role_tag:
         type: string
         required: true
         status: SUPPORTED
@@ -1019,27 +1011,27 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
-      port_pd_server_b_port_ip_requirements:
+      port_pd_server_1b_port_replacement_policy:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
-      port_pd_server_b_port_network:
-        type: list
+          type: string
+      port_pd_server_1b_port_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
-      port_pd_server_b_port_network_role_tag:
+      port_pd_server_1b_port_network_role:
         type: string
         required: true
         status: SUPPORTED
-      port_pd_server_b_port_network_role:
-        type: string
+      port_pd_server_1b_port_fixed_ips:
+        type: list
         required: true
         status: SUPPORTED
-      port_pd_server_b_port_replacement_policy:
+        entry_schema:
+          type: org.openecomp.datatypes.heat.neutron.port.FixedIps
+      port_pd_server_1b_port_network:
         type: list
         required: true
         status: SUPPORTED
@@ -1051,16 +1043,24 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      port_pd_server_b_port_order:
+      port_pd_server_1b_port_order:
         type: integer
         required: true
         status: SUPPORTED
-      port_pd_server_b_port_vlan_requirements:
+      port_pd_server_1b_port_exCP_naming:
+        type: org.openecomp.datatypes.Naming
+        required: true
+        status: SUPPORTED
+      port_pd_server_1b_port_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
+          type: org.openecomp.datatypes.network.IpRequirements
+      port_pd_server_1b_port_subnetpoolid:
+        type: string
+        required: true
+        status: SUPPORTED
     requirements:
     - dependency_pd_server_1b:
         capability: tosca.capabilities.Node
@@ -1076,14 +1076,14 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_pd_server_1b_pd_server_b_port:
+    - dependency_pd_server_1b_pd_server_1b_port:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_pd_server_1b_pd_server_b_port:
+    - link_pd_server_1b_pd_server_1b_port:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
@@ -1096,6 +1096,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      feature_pd_server_1b_pd_server_1b_port:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
       host_pd_server_1b:
         type: tosca.capabilities.Container
         valid_source_types:
@@ -1109,37 +1114,25 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      feature_pd_server_1b_pd_server_b_port:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
       disk.allocation_pd_server_1b:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_pd_server_1b_pd_server_b_port:
+      network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_pd_server_1b_pd_server_b_port:
+      cpu.delta_pd_server_1b:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      binding_pd_server_1b_pd_server_b_port:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        occurrences:
-        - 0
-        - UNBOUNDED
-      cpu.delta_pd_server_1b:
+      network.incoming.bytes_pd_server_1b_pd_server_1b_port:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -1162,6 +1155,13 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      binding_pd_server_1b_pd_server_1b_port:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
       cpu_pd_server_1b:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -1197,8 +1197,9 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_pd_server_1b_pd_server_b_port:
-        type: tosca.capabilities.Attachment
+      network.outpoing.packets_pd_server_1b_pd_server_1b_port:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
@@ -1232,25 +1233,30 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      attachment_pd_server_1b_pd_server_1b_port:
+        type: tosca.capabilities.Attachment
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.write.requests_pd_server_1b:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_pd_server_1b_pd_server_b_port:
+      disk.latency_pd_server_1b:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.latency_pd_server_1b:
+      disk.ephemeral.size_pd_server_1b:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.ephemeral.size_pd_server_1b:
+      network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -1285,12 +1291,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_pd_server_1b_pd_server_b_port:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
       disk.write.bytes_pd_server_1b:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -1314,6 +1314,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      network.incoming.packets.rate_pd_server_1b_pd_server_1b_port:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
       instance_pd_server_1b:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -1331,19 +1337,19 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      memory.resident_pd_server_1b:
+      network.outgoing.bytes_pd_server_1b_pd_server_1b_port:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_pd_server_1b_pd_server_b_port:
+      memory.resident_pd_server_1b:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_pd_server_1b_pd_server_b_port:
+      network.incoming.packets_pd_server_1b_pd_server_1b_port:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -1367,7 +1373,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_pd_server_1b_pd_server_b_port:
+      network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -1385,12 +1391,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_pd_server_1b_pd_server_b_port:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
       disk.write.requests.rate_pd_server_1b:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -3833,24 +3833,26 @@ node_types:
   org.openecomp.resource.abstract.nodes.ps_server_1b:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
-      port_ps_server_b_port_vlan_requirements:
+      port_ps_server_1b_port_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
-      port_ps_server_b_port_ip_requirements:
-        type: list
+      port_ps_server_1b_port_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
-      port_ps_server_b_port_replacement_policy:
+      port_ps_server_1b_port_network_role_tag:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_ps_server_1b_port_fixed_ips:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
+          type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
@@ -3859,50 +3861,48 @@ node_types:
         status: SUPPORTED
         constraints:
         - greater_or_equal: 0
-      port_ps_server_b_port_network_role:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_ps_server_b_port_fixed_ips:
-        type: list
+      port_ps_server_1b_port_order:
+        type: integer
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       vm_flavor_name:
         type: string
         required: true
         status: SUPPORTED
-      port_ps_server_b_port_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
+      port_ps_server_1b_port_network:
+        type: list
         required: true
         status: SUPPORTED
-      port_ps_server_b_port_subnetpoolid:
-        type: string
+        entry_schema:
+          type: string
+      port_ps_server_1b_port_exCP_naming:
+        type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
-      port_ps_server_b_port_order:
-        type: integer
+      port_ps_server_1b_port_ip_requirements:
+        type: list
         required: true
         status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.IpRequirements
       vm_image_name:
         type: string
         required: true
         status: SUPPORTED
-      port_ps_server_b_port_exCP_naming:
-        type: org.openecomp.datatypes.Naming
-        required: true
-        status: SUPPORTED
-      port_ps_server_b_port_network_role_tag:
+      port_ps_server_1b_port_network_role:
         type: string
         required: true
         status: SUPPORTED
-      port_ps_server_b_port_network:
+      port_ps_server_1b_port_replacement_policy:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
+      port_ps_server_1b_port_subnetpoolid:
+        type: string
+        required: true
+        status: SUPPORTED
       compute_ps_server_1b_availability_zone:
         type: list
         required: true
@@ -3930,14 +3930,14 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_ps_server_1b_ps_server_b_port:
+    - dependency_ps_server_1b_ps_server_1b_port:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_ps_server_1b_ps_server_b_port:
+    - link_ps_server_1b_ps_server_1b_port:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
@@ -3997,13 +3997,18 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.capacity_ps_server_1b:
+      attachment_ps_server_1b_ps_server_1b_port:
+        type: tosca.capabilities.Attachment
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.outgoing.packets.rate_ps_server_1b_ps_server_1b_port:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_ps_server_1b_ps_server_b_port:
+      disk.device.capacity_ps_server_1b:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -4039,12 +4044,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_ps_server_1b_ps_server_b_port:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
       host_ps_server_1b:
         type: tosca.capabilities.Container
         valid_source_types:
@@ -4076,6 +4075,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      network.incoming.bytes_ps_server_1b_ps_server_1b_port:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.write.requests.rate_ps_server_1b:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -4100,66 +4105,60 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      feature_ps_server_1b_ps_server_b_port:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
       binding_ps_server_1b:
         type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_ps_server_1b_ps_server_b_port:
+      memory.resident_ps_server_1b:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_ps_server_1b_ps_server_b_port:
+      memory_ps_server_1b:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      memory.resident_ps_server_1b:
+      disk.write.bytes_ps_server_1b:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      memory_ps_server_1b:
+      disk.device.write.bytes.rate_ps_server_1b:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes_ps_server_1b:
+      disk.read.bytes_ps_server_1b:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes.rate_ps_server_1b:
+      network.incoming.packets.rate_ps_server_1b_ps_server_1b_port:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      binding_ps_server_1b_ps_server_b_port:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+      network.outgoing.bytes_ps_server_1b_ps_server_1b_port:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
-        - 0
+        - 1
         - UNBOUNDED
-      disk.read.bytes_ps_server_1b:
+      network.incoming.packets_ps_server_1b_ps_server_1b_port:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_ps_server_1b_ps_server_b_port:
+      network.outgoing.bytes.rate_ps_server_1b_ps_server_1b_port:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -4175,11 +4174,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_ps_server_1b_ps_server_b_port:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
       disk.iops_ps_server_1b:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -4198,13 +4192,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_ps_server_1b_ps_server_b_port:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
-      network.incoming.packets_ps_server_1b_ps_server_b_port:
+      network.outpoing.packets_ps_server_1b_ps_server_1b_port:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -4227,19 +4215,24 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      vcpus_ps_server_1b:
+      network.incoming.bytes.rate_ps_server_1b_ps_server_1b_port:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu.delta_ps_server_1b:
+      feature_ps_server_1b_ps_server_1b_port:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      vcpus_ps_server_1b:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_ps_server_1b_ps_server_b_port:
+      cpu.delta_ps_server_1b:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -4251,6 +4244,13 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      binding_ps_server_1b_ps_server_1b_port:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
   org.openecomp.resource.abstract.nodes.cmaui_1c1:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_pd_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_pd_server_1bServiceTemplate.yaml
index 81488c79d9..1dbe52f405 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_pd_server_1bServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_pd_server_1bServiceTemplate.yaml
@@ -16,9 +16,6 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    port_pd_server_b_port_exCP_naming:
-      type: org.openecomp.datatypes.Naming
-      required: true
     index_value:
       type: integer
       description: Index value of this substitution service template runtime instance
@@ -29,37 +26,34 @@ topology_template:
     vm_flavor_name:
       type: string
       required: true
-    port_pd_server_b_port_mac_requirements:
-      type: org.openecomp.datatypes.network.MacRequirements
-      required: true
-    port_pd_server_b_port_fixed_ips:
+    port_pd_server_1b_port_vlan_requirements:
       type: list
       required: true
       entry_schema:
-        type: org.openecomp.datatypes.heat.neutron.port.FixedIps
-    port_pd_server_b_port_subnetpoolid:
+        type: org.openecomp.datatypes.network.VlanRequirements
+    port_pd_server_1b_port_network_role_tag:
       type: string
       required: true
     vm_image_name:
       type: string
       required: true
-    port_pd_server_b_port_ip_requirements:
-      type: list
-      required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.IpRequirements
-    port_pd_server_b_port_network:
+    port_pd_server_1b_port_replacement_policy:
       type: list
       required: true
       entry_schema:
         type: string
-    port_pd_server_b_port_network_role_tag:
-      type: string
+    port_pd_server_1b_port_mac_requirements:
+      type: org.openecomp.datatypes.network.MacRequirements
       required: true
-    port_pd_server_b_port_network_role:
+    port_pd_server_1b_port_network_role:
       type: string
       required: true
-    port_pd_server_b_port_replacement_policy:
+    port_pd_server_1b_port_fixed_ips:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.heat.neutron.port.FixedIps
+    port_pd_server_1b_port_network:
       type: list
       required: true
       entry_schema:
@@ -69,14 +63,20 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    port_pd_server_b_port_order:
+    port_pd_server_1b_port_order:
       type: integer
       required: true
-    port_pd_server_b_port_vlan_requirements:
+    port_pd_server_1b_port_exCP_naming:
+      type: org.openecomp.datatypes.Naming
+      required: true
+    port_pd_server_1b_port_ip_requirements:
       type: list
       required: true
       entry_schema:
-        type: org.openecomp.datatypes.network.VlanRequirements
+        type: org.openecomp.datatypes.network.IpRequirements
+    port_pd_server_1b_port_subnetpoolid:
+      type: string
+      required: true
   node_templates:
     pd_server_1b:
       type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server_1b
@@ -93,34 +93,34 @@ topology_template:
           get_input:
           - compute_pd_server_1b_name
           - index_value
-    pd_server_1b_pd_server_b_port:
+    pd_server_1b_pd_server_1b_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         exCP_naming:
-          get_input: port_pd_server_b_port_exCP_naming
+          get_input: port_pd_server_1b_port_exCP_naming
         replacement_policy:
           get_input:
-          - port_pd_server_b_port_replacement_policy
+          - port_pd_server_1b_port_replacement_policy
           - index_value
         vlan_requirements:
-          get_input: port_pd_server_b_port_vlan_requirements
+          get_input: port_pd_server_1b_port_vlan_requirements
         ip_requirements:
-          get_input: port_pd_server_b_port_ip_requirements
+          get_input: port_pd_server_1b_port_ip_requirements
         network_role_tag:
-          get_input: port_pd_server_b_port_network_role_tag
+          get_input: port_pd_server_1b_port_network_role_tag
         mac_requirements:
-          get_input: port_pd_server_b_port_mac_requirements
+          get_input: port_pd_server_1b_port_mac_requirements
         order:
-          get_input: port_pd_server_b_port_order
+          get_input: port_pd_server_1b_port_order
         network_role:
-          get_input: port_pd_server_b_port_network_role
+          get_input: port_pd_server_1b_port_network_role
         subnetpoolid:
-          get_input: port_pd_server_b_port_subnetpoolid
+          get_input: port_pd_server_1b_port_subnetpoolid
         fixed_ips:
-          get_input: port_pd_server_b_port_fixed_ips
+          get_input: port_pd_server_1b_port_fixed_ips
         network:
           get_input:
-          - port_pd_server_b_port_network
+          - port_pd_server_1b_port_network
           - index_value
       requirements:
       - binding:
@@ -133,30 +133,27 @@ topology_template:
       disk.device.read.bytes_pd_server_1b:
       - pd_server_1b
       - disk.device.read.bytes
+      feature_pd_server_1b_pd_server_1b_port:
+      - pd_server_1b_pd_server_1b_port
+      - feature
       host_pd_server_1b:
       - pd_server_1b
       - host
       disk.read.bytes.rate_pd_server_1b:
       - pd_server_1b
       - disk.read.bytes.rate
-      feature_pd_server_1b_pd_server_b_port:
-      - pd_server_1b_pd_server_b_port
-      - feature
       disk.allocation_pd_server_1b:
       - pd_server_1b
       - disk.allocation
-      network.incoming.bytes_pd_server_1b_pd_server_b_port:
-      - pd_server_1b_pd_server_b_port
-      - network.incoming.bytes
-      network.outgoing.bytes.rate_pd_server_1b_pd_server_b_port:
-      - pd_server_1b_pd_server_b_port
-      - network.outgoing.bytes.rate
-      binding_pd_server_1b_pd_server_b_port:
-      - pd_server_1b_pd_server_b_port
-      - binding
+      network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port:
+      - pd_server_1b_pd_server_1b_port
+      - network.incoming.bytes.rate
       cpu.delta_pd_server_1b:
       - pd_server_1b
       - cpu.delta
+      network.incoming.bytes_pd_server_1b_pd_server_1b_port:
+      - pd_server_1b_pd_server_1b_port
+      - network.incoming.bytes
       disk.device.read.requests_pd_server_1b:
       - pd_server_1b
       - disk.device.read.requests
@@ -166,6 +163,9 @@ topology_template:
       disk.device.iops_pd_server_1b:
       - pd_server_1b
       - disk.device.iops
+      binding_pd_server_1b_pd_server_1b_port:
+      - pd_server_1b_pd_server_1b_port
+      - binding
       cpu_pd_server_1b:
       - pd_server_1b
       - cpu
@@ -184,9 +184,9 @@ topology_template:
       memory.usage_pd_server_1b:
       - pd_server_1b
       - memory.usage
-      attachment_pd_server_1b_pd_server_b_port:
-      - pd_server_1b_pd_server_b_port
-      - attachment
+      network.outpoing.packets_pd_server_1b_pd_server_1b_port:
+      - pd_server_1b_pd_server_1b_port
+      - network.outpoing.packets
       memory_pd_server_1b:
       - pd_server_1b
       - memory
@@ -202,18 +202,21 @@ topology_template:
       disk.device.usage_pd_server_1b:
       - pd_server_1b
       - disk.device.usage
+      attachment_pd_server_1b_pd_server_1b_port:
+      - pd_server_1b_pd_server_1b_port
+      - attachment
       disk.device.write.requests_pd_server_1b:
       - pd_server_1b
       - disk.device.write.requests
-      network.incoming.bytes.rate_pd_server_1b_pd_server_b_port:
-      - pd_server_1b_pd_server_b_port
-      - network.incoming.bytes.rate
       disk.latency_pd_server_1b:
       - pd_server_1b
       - disk.latency
       disk.ephemeral.size_pd_server_1b:
       - pd_server_1b
       - disk.ephemeral.size
+      network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port:
+      - pd_server_1b_pd_server_1b_port
+      - network.outgoing.bytes.rate
       scalable_pd_server_1b:
       - pd_server_1b
       - scalable
@@ -229,9 +232,6 @@ topology_template:
       disk.iops_pd_server_1b:
       - pd_server_1b
       - disk.iops
-      network.incoming.packets.rate_pd_server_1b_pd_server_b_port:
-      - pd_server_1b_pd_server_b_port
-      - network.incoming.packets.rate
       disk.write.bytes_pd_server_1b:
       - pd_server_1b
       - disk.write.bytes
@@ -244,6 +244,9 @@ topology_template:
       vcpus_pd_server_1b:
       - pd_server_1b
       - vcpus
+      network.incoming.packets.rate_pd_server_1b_pd_server_1b_port:
+      - pd_server_1b_pd_server_1b_port
+      - network.incoming.packets.rate
       instance_pd_server_1b:
       - pd_server_1b
       - instance
@@ -253,15 +256,15 @@ topology_template:
       cpu_util_pd_server_1b:
       - pd_server_1b
       - cpu_util
+      network.outgoing.bytes_pd_server_1b_pd_server_1b_port:
+      - pd_server_1b_pd_server_1b_port
+      - network.outgoing.bytes
       memory.resident_pd_server_1b:
       - pd_server_1b
       - memory.resident
-      network.incoming.packets_pd_server_1b_pd_server_b_port:
-      - pd_server_1b_pd_server_b_port
+      network.incoming.packets_pd_server_1b_pd_server_1b_port:
+      - pd_server_1b_pd_server_1b_port
       - network.incoming.packets
-      network.outgoing.packets.rate_pd_server_1b_pd_server_b_port:
-      - pd_server_1b_pd_server_b_port
-      - network.outgoing.packets.rate
       disk.device.write.requests.rate_pd_server_1b:
       - pd_server_1b
       - disk.device.write.requests.rate
@@ -271,18 +274,15 @@ topology_template:
       disk.read.requests_pd_server_1b:
       - pd_server_1b
       - disk.read.requests
-      network.outpoing.packets_pd_server_1b_pd_server_b_port:
-      - pd_server_1b_pd_server_b_port
-      - network.outpoing.packets
+      network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port:
+      - pd_server_1b_pd_server_1b_port
+      - network.outgoing.packets.rate
       disk.capacity_pd_server_1b:
       - pd_server_1b
       - disk.capacity
       disk.usage_pd_server_1b:
       - pd_server_1b
       - disk.usage
-      network.outgoing.bytes_pd_server_1b_pd_server_b_port:
-      - pd_server_1b_pd_server_b_port
-      - network.outgoing.bytes
       disk.write.requests.rate_pd_server_1b:
       - pd_server_1b
       - disk.write.requests.rate
@@ -293,9 +293,9 @@ topology_template:
       local_storage_pd_server_1b:
       - pd_server_1b
       - local_storage
-      link_pd_server_1b_pd_server_b_port:
-      - pd_server_1b_pd_server_b_port
+      link_pd_server_1b_pd_server_1b_port:
+      - pd_server_1b_pd_server_1b_port
       - link
-      dependency_pd_server_1b_pd_server_b_port:
-      - pd_server_1b_pd_server_b_port
+      dependency_pd_server_1b_pd_server_1b_port:
+      - pd_server_1b_pd_server_1b_port
       - dependency
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_ps_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_ps_server_1bServiceTemplate.yaml
index 6d0f966e57..c97cb23644 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_ps_server_1bServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_ps_server_1bServiceTemplate.yaml
@@ -11,21 +11,22 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
-    port_ps_server_b_port_vlan_requirements:
+    port_ps_server_1b_port_vlan_requirements:
       type: list
       required: true
       entry_schema:
         type: org.openecomp.datatypes.network.VlanRequirements
-    port_ps_server_b_port_ip_requirements:
-      type: list
+    port_ps_server_1b_port_mac_requirements:
+      type: org.openecomp.datatypes.network.MacRequirements
       required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.IpRequirements
-    port_ps_server_b_port_replacement_policy:
+    port_ps_server_1b_port_network_role_tag:
+      type: string
+      required: true
+    port_ps_server_1b_port_fixed_ips:
       type: list
       required: true
       entry_schema:
-        type: string
+        type: org.openecomp.datatypes.heat.neutron.port.FixedIps
     index_value:
       type: integer
       description: Index value of this substitution service template runtime instance
@@ -33,40 +34,39 @@ topology_template:
       default: 0
       constraints:
       - greater_or_equal: 0
-    port_ps_server_b_port_network_role:
-      type: string
-      required: true
-    port_ps_server_b_port_fixed_ips:
-      type: list
+    port_ps_server_1b_port_order:
+      type: integer
       required: true
-      entry_schema:
-        type: org.openecomp.datatypes.heat.neutron.port.FixedIps
     vm_flavor_name:
       type: string
       required: true
-    port_ps_server_b_port_mac_requirements:
-      type: org.openecomp.datatypes.network.MacRequirements
+    port_ps_server_1b_port_network:
+      type: list
       required: true
-    port_ps_server_b_port_subnetpoolid:
-      type: string
+      entry_schema:
+        type: string
+    port_ps_server_1b_port_exCP_naming:
+      type: org.openecomp.datatypes.Naming
       required: true
-    port_ps_server_b_port_order:
-      type: integer
+    port_ps_server_1b_port_ip_requirements:
+      type: list
       required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.IpRequirements
     vm_image_name:
       type: string
       required: true
-    port_ps_server_b_port_exCP_naming:
-      type: org.openecomp.datatypes.Naming
-      required: true
-    port_ps_server_b_port_network_role_tag:
+    port_ps_server_1b_port_network_role:
       type: string
       required: true
-    port_ps_server_b_port_network:
+    port_ps_server_1b_port_replacement_policy:
       type: list
       required: true
       entry_schema:
         type: string
+    port_ps_server_1b_port_subnetpoolid:
+      type: string
+      required: true
     compute_ps_server_1b_availability_zone:
       type: list
       required: true
@@ -93,34 +93,34 @@ topology_template:
           get_input:
           - compute_ps_server_1b_name
           - index_value
-    ps_server_1b_ps_server_b_port:
+    ps_server_1b_ps_server_1b_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         exCP_naming:
-          get_input: port_ps_server_b_port_exCP_naming
+          get_input: port_ps_server_1b_port_exCP_naming
         replacement_policy:
           get_input:
-          - port_ps_server_b_port_replacement_policy
+          - port_ps_server_1b_port_replacement_policy
           - index_value
         vlan_requirements:
-          get_input: port_ps_server_b_port_vlan_requirements
+          get_input: port_ps_server_1b_port_vlan_requirements
         ip_requirements:
-          get_input: port_ps_server_b_port_ip_requirements
+          get_input: port_ps_server_1b_port_ip_requirements
         network_role_tag:
-          get_input: port_ps_server_b_port_network_role_tag
+          get_input: port_ps_server_1b_port_network_role_tag
         mac_requirements:
-          get_input: port_ps_server_b_port_mac_requirements
+          get_input: port_ps_server_1b_port_mac_requirements
         order:
-          get_input: port_ps_server_b_port_order
+          get_input: port_ps_server_1b_port_order
         network_role:
-          get_input: port_ps_server_b_port_network_role
+          get_input: port_ps_server_1b_port_network_role
         subnetpoolid:
-          get_input: port_ps_server_b_port_subnetpoolid
+          get_input: port_ps_server_1b_port_subnetpoolid
         fixed_ips:
-          get_input: port_ps_server_b_port_fixed_ips
+          get_input: port_ps_server_1b_port_fixed_ips
         network:
           get_input:
-          - port_ps_server_b_port_network
+          - port_ps_server_1b_port_network
           - index_value
       requirements:
       - binding:
@@ -157,12 +157,15 @@ topology_template:
       disk.device.iops_ps_server_1b:
       - ps_server_1b
       - disk.device.iops
+      attachment_ps_server_1b_ps_server_1b_port:
+      - ps_server_1b_ps_server_1b_port
+      - attachment
+      network.outgoing.packets.rate_ps_server_1b_ps_server_1b_port:
+      - ps_server_1b_ps_server_1b_port
+      - network.outgoing.packets.rate
       disk.device.capacity_ps_server_1b:
       - ps_server_1b
       - disk.device.capacity
-      network.incoming.packets.rate_ps_server_1b_ps_server_b_port:
-      - ps_server_1b_ps_server_b_port
-      - network.incoming.packets.rate
       instance_ps_server_1b:
       - ps_server_1b
       - instance
@@ -178,9 +181,6 @@ topology_template:
       disk.device.read.requests_ps_server_1b:
       - ps_server_1b
       - disk.device.read.requests
-      network.incoming.bytes.rate_ps_server_1b_ps_server_b_port:
-      - ps_server_1b_ps_server_b_port
-      - network.incoming.bytes.rate
       host_ps_server_1b:
       - ps_server_1b
       - host
@@ -196,6 +196,9 @@ topology_template:
       disk.capacity_ps_server_1b:
       - ps_server_1b
       - disk.capacity
+      network.incoming.bytes_ps_server_1b_ps_server_1b_port:
+      - ps_server_1b_ps_server_1b_port
+      - network.incoming.bytes
       disk.write.requests.rate_ps_server_1b:
       - ps_server_1b
       - disk.write.requests.rate
@@ -208,18 +211,9 @@ topology_template:
       disk.root.size_ps_server_1b:
       - ps_server_1b
       - disk.root.size
-      feature_ps_server_1b_ps_server_b_port:
-      - ps_server_1b_ps_server_b_port
-      - feature
       binding_ps_server_1b:
       - ps_server_1b
       - binding
-      network.incoming.bytes_ps_server_1b_ps_server_b_port:
-      - ps_server_1b_ps_server_b_port
-      - network.incoming.bytes
-      network.outgoing.bytes.rate_ps_server_1b_ps_server_b_port:
-      - ps_server_1b_ps_server_b_port
-      - network.outgoing.bytes.rate
       memory.resident_ps_server_1b:
       - ps_server_1b
       - memory.resident
@@ -232,24 +226,27 @@ topology_template:
       disk.device.write.bytes.rate_ps_server_1b:
       - ps_server_1b
       - disk.device.write.bytes.rate
-      binding_ps_server_1b_ps_server_b_port:
-      - ps_server_1b_ps_server_b_port
-      - binding
       disk.read.bytes_ps_server_1b:
       - ps_server_1b
       - disk.read.bytes
-      network.outgoing.bytes_ps_server_1b_ps_server_b_port:
-      - ps_server_1b_ps_server_b_port
+      network.incoming.packets.rate_ps_server_1b_ps_server_1b_port:
+      - ps_server_1b_ps_server_1b_port
+      - network.incoming.packets.rate
+      network.outgoing.bytes_ps_server_1b_ps_server_1b_port:
+      - ps_server_1b_ps_server_1b_port
       - network.outgoing.bytes
+      network.incoming.packets_ps_server_1b_ps_server_1b_port:
+      - ps_server_1b_ps_server_1b_port
+      - network.incoming.packets
+      network.outgoing.bytes.rate_ps_server_1b_ps_server_1b_port:
+      - ps_server_1b_ps_server_1b_port
+      - network.outgoing.bytes.rate
       feature_ps_server_1b:
       - ps_server_1b
       - feature
       os_ps_server_1b:
       - ps_server_1b
       - os
-      attachment_ps_server_1b_ps_server_b_port:
-      - ps_server_1b_ps_server_b_port
-      - attachment
       disk.iops_ps_server_1b:
       - ps_server_1b
       - disk.iops
@@ -259,12 +256,9 @@ topology_template:
       disk.write.requests_ps_server_1b:
       - ps_server_1b
       - disk.write.requests
-      network.outgoing.packets.rate_ps_server_1b_ps_server_b_port:
-      - ps_server_1b_ps_server_b_port
-      - network.outgoing.packets.rate
-      network.incoming.packets_ps_server_1b_ps_server_b_port:
-      - ps_server_1b_ps_server_b_port
-      - network.incoming.packets
+      network.outpoing.packets_ps_server_1b_ps_server_1b_port:
+      - ps_server_1b_ps_server_1b_port
+      - network.outpoing.packets
       memory.usage_ps_server_1b:
       - ps_server_1b
       - memory.usage
@@ -274,27 +268,33 @@ topology_template:
       endpoint_ps_server_1b:
       - ps_server_1b
       - endpoint
+      network.incoming.bytes.rate_ps_server_1b_ps_server_1b_port:
+      - ps_server_1b_ps_server_1b_port
+      - network.incoming.bytes.rate
+      feature_ps_server_1b_ps_server_1b_port:
+      - ps_server_1b_ps_server_1b_port
+      - feature
       vcpus_ps_server_1b:
       - ps_server_1b
       - vcpus
       cpu.delta_ps_server_1b:
       - ps_server_1b
       - cpu.delta
-      network.outpoing.packets_ps_server_1b_ps_server_b_port:
-      - ps_server_1b_ps_server_b_port
-      - network.outpoing.packets
       disk.ephemeral.size_ps_server_1b:
       - ps_server_1b
       - disk.ephemeral.size
+      binding_ps_server_1b_ps_server_1b_port:
+      - ps_server_1b_ps_server_1b_port
+      - binding
     requirements:
       local_storage_ps_server_1b:
       - ps_server_1b
       - local_storage
-      dependency_ps_server_1b_ps_server_b_port:
-      - ps_server_1b_ps_server_b_port
+      dependency_ps_server_1b_ps_server_1b_port:
+      - ps_server_1b_ps_server_1b_port
       - dependency
-      link_ps_server_1b_ps_server_b_port:
-      - ps_server_1b_ps_server_b_port
+      link_ps_server_1b_ps_server_1b_port:
+      - ps_server_1b_ps_server_1b_port
       - link
       dependency_ps_server_1b:
       - ps_server_1b
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/nested1ServiceTemplate.yaml
index cb7fdc359a..a3bf3f973a 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/nested1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/nested1ServiceTemplate.yaml
@@ -185,28 +185,28 @@ topology_template:
           - 0
         vm_flavor_name:
           get_input: pd_server_1b_flavor
-        port_pd_server_b_port_mac_requirements:
+        vm_image_name:
+          get_input: pd_server_1b_image
+        port_pd_server_1b_port_replacement_policy:
+        - AUTO
+        port_pd_server_1b_port_mac_requirements:
           mac_count_required:
             is_required: false
-        port_pd_server_b_port_fixed_ips:
+        port_pd_server_1b_port_fixed_ips:
         - ip_address:
             get_input:
             - pd_server_1b_ips
             - 0
-        vm_image_name:
-          get_input: pd_server_1b_image
-        port_pd_server_b_port_ip_requirements:
+        port_pd_server_1b_port_network:
+        - get_input: net
+        compute_pd_server_1b_availability_zone:
+        - get_input: availability_zone_0
+        port_pd_server_1b_port_ip_requirements:
         - ip_version: 4
           ip_count_required:
             is_required: true
           floating_ip_count_required:
             is_required: false
-        port_pd_server_b_port_network:
-        - get_input: net
-        port_pd_server_b_port_replacement_policy:
-        - AUTO
-        compute_pd_server_1b_availability_zone:
-        - get_input: availability_zone_0
         service_template_filter:
           substitute_service_template: Nested_pd_server_1bServiceTemplate.yaml
           count: 1
@@ -220,28 +220,28 @@ topology_template:
       directives:
       - substitutable
       properties:
-        port_ps_server_b_port_ip_requirements:
-        - ip_version: 4
-          ip_count_required:
-            is_required: true
-          floating_ip_count_required:
+        port_ps_server_1b_port_mac_requirements:
+          mac_count_required:
             is_required: false
-        port_ps_server_b_port_replacement_policy:
-        - AUTO
-        port_ps_server_b_port_fixed_ips:
+        port_ps_server_1b_port_fixed_ips:
         - ip_address:
             get_input:
             - ps_server_1b_ips
             - 0
         vm_flavor_name:
           get_input: ps_server_1b_flavor
-        port_ps_server_b_port_mac_requirements:
-          mac_count_required:
+        port_ps_server_1b_port_network:
+        - get_input: net
+        port_ps_server_1b_port_ip_requirements:
+        - ip_version: 4
+          ip_count_required:
+            is_required: true
+          floating_ip_count_required:
             is_required: false
         vm_image_name:
           get_input: ps_server_1b_image
-        port_ps_server_b_port_network:
-        - get_input: net
+        port_ps_server_1b_port_replacement_policy:
+        - AUTO
         compute_ps_server_1b_availability_zone:
         - get_input: availability_zone_0
         compute_ps_server_1b_name:
@@ -420,7 +420,7 @@ topology_template:
       - disk.usage_oam_server_1c2
       network.incoming.bytes_pd_server_1b_port:
       - abstract_pd_server_1b
-      - network.incoming.bytes_pd_server_1b_pd_server_b_port
+      - network.incoming.bytes_pd_server_1b_pd_server_1b_port
       feature_server_1c1_cmaui_2:
       - abstract_cmaui_1c1
       - feature_cmaui_1c1
@@ -450,10 +450,10 @@ topology_template:
       - disk.device.iops_pd_server_1b
       network.incoming.packets_pd_server_1b_port:
       - abstract_pd_server_1b
-      - network.incoming.packets_pd_server_1b_pd_server_b_port
+      - network.incoming.packets_pd_server_1b_pd_server_1b_port
       attachment_ps_server_1b_port:
       - abstract_ps_server_1b
-      - attachment_ps_server_1b_ps_server_b_port
+      - attachment_ps_server_1b_ps_server_1b_port
       disk.device.write.requests.rate_server_1c2_oam_1:
       - abstract_oam_server_1c2_0
       - disk.device.write.requests.rate_oam_server_1c2
@@ -612,7 +612,7 @@ topology_template:
       - feature_cmaui_1c1_cmaui_port
       network.incoming.bytes.rate_pd_server_1b_port:
       - abstract_pd_server_1b
-      - network.incoming.bytes.rate_pd_server_1b_pd_server_b_port
+      - network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port
       network.outgoing.bytes_oam_port_2:
       - abstract_oam_server_1c2_1
       - network.outgoing.bytes_oam_server_1c2_oam_port
@@ -678,7 +678,7 @@ topology_template:
       - endpoint_cmaui_1c1
       network.outgoing.packets.rate_ps_server_1b_port:
       - abstract_ps_server_1b
-      - network.outgoing.packets.rate_ps_server_1b_ps_server_b_port
+      - network.outgoing.packets.rate_ps_server_1b_ps_server_1b_port
       endpoint_server_1c1_cmaui_1:
       - abstract_cmaui_1c1
       - endpoint_cmaui_1c1
@@ -693,16 +693,16 @@ topology_template:
       - disk.device.usage_cmaui_1c1
       network.incoming.bytes_ps_server_1b_port:
       - abstract_ps_server_1b
-      - network.incoming.bytes_ps_server_1b_ps_server_b_port
+      - network.incoming.bytes_ps_server_1b_ps_server_1b_port
       attachment_pd_server_1b_port:
       - abstract_pd_server_1b
-      - attachment_pd_server_1b_pd_server_b_port
+      - attachment_pd_server_1b_pd_server_1b_port
       vcpus_server_1c1_cmaui_2:
       - abstract_cmaui_1c1
       - vcpus_cmaui_1c1
       binding_ps_server_1b_port:
       - abstract_ps_server_1b
-      - binding_ps_server_1b_ps_server_b_port
+      - binding_ps_server_1b_ps_server_1b_port
       disk.device.write.bytes.rate_server_1b_ps:
       - abstract_ps_server_1b
       - disk.device.write.bytes.rate_ps_server_1b
@@ -747,7 +747,7 @@ topology_template:
       - disk.device.read.requests_ps_server_1b
       binding_pd_server_1b_port:
       - abstract_pd_server_1b
-      - binding_pd_server_1b_pd_server_b_port
+      - binding_pd_server_1b_pd_server_1b_port
       disk.read.bytes_server_1c2_oam_1:
       - abstract_oam_server_1c2_0
       - disk.read.bytes_oam_server_1c2
@@ -813,7 +813,7 @@ topology_template:
       - memory.usage_oam_server_1c2
       network.outpoing.packets_ps_server_1b_port:
       - abstract_ps_server_1b
-      - network.outpoing.packets_ps_server_1b_ps_server_b_port
+      - network.outpoing.packets_ps_server_1b_ps_server_1b_port
       memory.usage_server_1c2_oam_1:
       - abstract_oam_server_1c2_0
       - memory.usage_oam_server_1c2
@@ -843,7 +843,7 @@ topology_template:
       - memory.resident_cmaui_1c1
       network.incoming.bytes.rate_ps_server_1b_port:
       - abstract_ps_server_1b
-      - network.incoming.bytes.rate_ps_server_1b_ps_server_b_port
+      - network.incoming.bytes.rate_ps_server_1b_ps_server_1b_port
       network.incoming.bytes.rate_oam_port_1:
       - abstract_oam_server_1c2_0
       - network.incoming.bytes.rate_oam_server_1c2_oam_port
@@ -885,7 +885,7 @@ topology_template:
       - binding_cmaui_1c1
       feature_ps_server_1b_port:
       - abstract_ps_server_1b
-      - feature_ps_server_1b_ps_server_b_port
+      - feature_ps_server_1b_ps_server_1b_port
       disk.device.iops_server_1c2_oam_2:
       - abstract_oam_server_1c2_1
       - disk.device.iops_oam_server_1c2
@@ -912,7 +912,7 @@ topology_template:
       - attachment
       network.outgoing.packets.rate_pd_server_1b_port:
       - abstract_pd_server_1b
-      - network.outgoing.packets.rate_pd_server_1b_pd_server_b_port
+      - network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port
       memory_server_1c1_cmaui_1:
       - abstract_cmaui_1c1
       - memory_cmaui_1c1
@@ -981,10 +981,10 @@ topology_template:
       - network.incoming.packets_cmaui_1c1_cmaui_port
       network.outgoing.bytes.rate_ps_server_1b_port:
       - abstract_ps_server_1b
-      - network.outgoing.bytes.rate_ps_server_1b_ps_server_b_port
+      - network.outgoing.bytes.rate_ps_server_1b_ps_server_1b_port
       network.incoming.packets.rate_ps_server_1b_port:
       - abstract_ps_server_1b
-      - network.incoming.packets.rate_ps_server_1b_ps_server_b_port
+      - network.incoming.packets.rate_ps_server_1b_ps_server_1b_port
       disk.device.write.requests.rate_server_1c1_cmaui_2:
       - abstract_cmaui_1c1
       - disk.device.write.requests.rate_cmaui_1c1
@@ -1047,7 +1047,7 @@ topology_template:
       - end_point
       network.outpoing.packets_pd_server_1b_port:
       - abstract_pd_server_1b
-      - network.outpoing.packets_pd_server_1b_pd_server_b_port
+      - network.outpoing.packets_pd_server_1b_pd_server_1b_port
       feature_server_1b_pd:
       - abstract_pd_server_1b
       - feature_pd_server_1b
@@ -1074,7 +1074,7 @@ topology_template:
       - disk.device.allocation_oam_server_1c2
       network.outgoing.bytes_pd_server_1b_port:
       - abstract_pd_server_1b
-      - network.outgoing.bytes_pd_server_1b_pd_server_b_port
+      - network.outgoing.bytes_pd_server_1b_pd_server_1b_port
       disk.write.bytes_server_1b_pd:
       - abstract_pd_server_1b
       - disk.write.bytes_pd_server_1b
@@ -1212,13 +1212,13 @@ topology_template:
       - disk.device.read.requests.rate_cmaui_1c1
       network.incoming.packets_ps_server_1b_port:
       - abstract_ps_server_1b
-      - network.incoming.packets_ps_server_1b_ps_server_b_port
+      - network.incoming.packets_ps_server_1b_ps_server_1b_port
       disk.write.requests_server_1b_ps:
       - abstract_ps_server_1b
       - disk.write.requests_ps_server_1b
       feature_pd_server_1b_port:
       - abstract_pd_server_1b
-      - feature_pd_server_1b_pd_server_b_port
+      - feature_pd_server_1b_pd_server_1b_port
       disk.latency_server_1c1_cmaui_1:
       - abstract_cmaui_1c1
       - disk.latency_cmaui_1c1
@@ -1251,7 +1251,7 @@ topology_template:
       - disk.write.bytes_cmaui_1c1
       network.outgoing.bytes.rate_pd_server_1b_port:
       - abstract_pd_server_1b
-      - network.outgoing.bytes.rate_pd_server_1b_pd_server_b_port
+      - network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port
       disk.write.bytes_server_1c1_cmaui_2:
       - abstract_cmaui_1c1
       - disk.write.bytes_cmaui_1c1
@@ -1263,7 +1263,7 @@ topology_template:
       - feature_oam_server_1c2_oam_port
       network.incoming.packets.rate_pd_server_1b_port:
       - abstract_pd_server_1b
-      - network.incoming.packets.rate_pd_server_1b_pd_server_b_port
+      - network.incoming.packets.rate_pd_server_1b_pd_server_1b_port
       disk.device.latency_server_1c1_cmaui_1:
       - abstract_cmaui_1c1
       - disk.device.latency_cmaui_1c1
@@ -1305,7 +1305,7 @@ topology_template:
       - network.incoming.bytes.rate_cmaui_1c1_cmaui_port
       network.outgoing.bytes_ps_server_1b_port:
       - abstract_ps_server_1b
-      - network.outgoing.bytes_ps_server_1b_ps_server_b_port
+      - network.outgoing.bytes_ps_server_1b_ps_server_1b_port
       network.incoming.bytes.rate_cmaui_port_2:
       - abstract_cmaui_1c1
       - network.incoming.bytes.rate_cmaui_1c1_cmaui_port
@@ -1348,7 +1348,7 @@ topology_template:
       - dependency_pd_server_1b
       link_pd_server_1b_port:
       - abstract_pd_server_1b
-      - link_pd_server_1b_pd_server_b_port
+      - link_pd_server_1b_pd_server_1b_port
       local_storage_server_1b_ps:
       - abstract_ps_server_1b
       - local_storage_ps_server_1b
@@ -1366,13 +1366,13 @@ topology_template:
       - dependency_cmaui_1c1
       link_ps_server_1b_port:
       - abstract_ps_server_1b
-      - link_ps_server_1b_ps_server_b_port
+      - link_ps_server_1b_ps_server_1b_port
       local_storage_server_1b_pd:
       - abstract_pd_server_1b
       - local_storage_pd_server_1b
       dependency_ps_server_1b_port:
       - abstract_ps_server_1b
-      - dependency_ps_server_1b_ps_server_b_port
+      - dependency_ps_server_1b_ps_server_1b_port
       dependency_server_1b_ps:
       - abstract_ps_server_1b
       - dependency_ps_server_1b
@@ -1390,7 +1390,7 @@ topology_template:
       - local_storage_oam_server_1c2
       dependency_pd_server_1b_port:
       - abstract_pd_server_1b
-      - dependency_pd_server_1b_pd_server_b_port
+      - dependency_pd_server_1b_pd_server_1b_port
       dependency_cmaui_port_1:
       - abstract_cmaui_1c1
       - dependency_cmaui_1c1_cmaui_port