Fix - Port type and vmtype underscore issue

1. Fix for consolidation of VMs for cases when:
   a. VM type contains an underscore
   b. Multiple ports per network role
2. Updated the unit test cases and test data

Change-Id: I875f3c8384f8ef2c2aa6add9e30a5f8899ae1a71
Issue-ID: SDC-1966
Signed-off-by: ojasdubey <ojas.dubey@amdocs.com>

4 files changed, 370 insertions, 370 deletions

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/in/nested_pattern5.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/in/nested_pattern5.yml
index 8998579aef..e4b250261f 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/in/nested_pattern5.yml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/in/nested_pattern5.yml
@@ -50,7 +50,7 @@ parameters:
     type: string
 
 resources:
-  pd_server_1b_port_0:
+  pd_server_1b_1_port_1:
     type: OS::Neutron::Port
     properties:
       network: {get_resource: packet_internal_network}
@@ -72,7 +72,7 @@ resources:
       availability_zone: { get_param: availability_zone_0 }
       flavor: { get_param: pd_server_1b_flavor }
       networks:
-      - port: { get_resource: pd_server_1b_port_0 }
+      - port: { get_resource: pd_server_1b_1_port_1 }
 
   server_1b_pd_1:
     type: OS::Nova::Server
@@ -103,7 +103,7 @@ resources:
       resource_def:
         type: nested_vlan.yml
         properties:
-          parent_interface: { get_resource: pd_server_1b_port_0}
+          parent_interface: { get_resource: pd_server_1b_1_port_1}
           net1: { get_resource: packet_external_network}
 
   test_resourceGroup_1:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml
index eba8068126..e53e4ad2c3 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -121,28 +121,28 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_pd_server_1b_port_0:
+    - dependency_packet_external_network:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_packet_external_network:
+    - dependency_test_resourceGroup_0:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_test_resourceGroup_0:
+    - dependency_template_Vlan_vmi_1_test_resourceGroup_0:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_template_Vlan_vmi_1_test_resourceGroup_0:
+    - dependency_pd_server_1b_1_port_1:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
@@ -190,11 +190,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      forwarder_pd_server_1b_port_0:
-        type: org.openecomp.capabilities.Forwarder
-        occurrences:
-        - 1
-        - UNBOUNDED
       disk.capacity_server_1b_pd_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -212,23 +207,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_pd_server_1b_port_0:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
       network.outpoing.packets_pd_server_1b_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
-      feature_pd_server_1b_port_0:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
       feature_pd_server_1b_port_1:
         type: tosca.capabilities.Node
         occurrences:
@@ -452,18 +436,41 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_pd_server_1b_port_0:
+      network.outgoing.bytes_pd_server_1b_1_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
+      network.outgoing.packets.rate_pd_server_1b_1_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
+      attachment_pd_server_1b_1_port_1:
+        type: tosca.capabilities.Attachment
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.outgoing.bytes_pd_server_1b_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
+      network.incoming.packets.rate_pd_server_1b_1_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
+      network.incoming.bytes.rate_pd_server_1b_1_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
       link_packet_external_network:
         type: tosca.capabilities.network.Linkable
         occurrences:
@@ -486,12 +493,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_pd_server_1b_port_0:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
       memory.resident_server_1b_pd_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -510,18 +511,19 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_pd_server_1b_port_0:
-        type: tosca.capabilities.Attachment
+      disk.ephemeral.size_server_1b_pd_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_1b_pd_0:
+      disk.ephemeral.size_server_1b_pd_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
-      disk.ephemeral.size_server_1b_pd_1:
+      network.incoming.bytes_pd_server_1b_1_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:
@@ -537,43 +539,37 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      instance_server_1b_pd_0:
+      network.outgoing.bytes.rate_pd_server_1b_1_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
-      disk.device.capacity_server_1b_pd_0:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
-      instance_server_1b_pd_1:
+      instance_server_1b_pd_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_1b_pd_1:
+      disk.device.capacity_server_1b_pd_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_pd_server_1b_port_1:
+      instance_server_1b_pd_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
-      network.outgoing.bytes.rate_pd_server_1b_port_0:
+      disk.device.capacity_server_1b_pd_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
-      network.incoming.packets.rate_pd_server_1b_port_0:
+      network.outgoing.bytes.rate_pd_server_1b_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:
@@ -600,6 +596,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      network.outpoing.packets_pd_server_1b_1_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
       network.incoming.packets.rate_pd_server_1b_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.
@@ -637,12 +639,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_pd_server_1b_port_0:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
       disk.root.size_server_1b_pd_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -696,19 +692,24 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      binding_pd_server_1b_1_port_1:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
       disk.allocation_server_1b_pd_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_pd_server_1b_port_0:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface
+      forwarder_pd_server_1b_1_port_1:
+        type: org.openecomp.capabilities.Forwarder
         occurrences:
-        - 0
+        - 1
         - UNBOUNDED
       disk.device.latency_server_1b_pd_1:
         type: org.openecomp.capabilities.metric.Ceilometer
@@ -769,6 +770,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      network.incoming.packets_pd_server_1b_1_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
       cpu.delta_server_1b_pd_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -793,19 +800,18 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_pd_server_1b_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.
+      feature_pd_server_1b_1_port_1:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      vcpus_server_1b_pd_1:
+      network.incoming.packets_pd_server_1b_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
-      network.incoming.packets_pd_server_1b_port_0:
+      vcpus_server_1b_pd_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:
@@ -858,12 +864,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_pd_server_1b_port_0:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
   org.openecomp.resource.abstract.nodes.pd_server_1b:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
@@ -879,143 +879,143 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: float
-      index_value:
-        type: integer
-        description: Index value of this substitution service template runtime instance
-        required: false
-        default: 0
-        status: SUPPORTED
-        constraints:
-        - greater_or_equal: 0
-      vm_flavor_name:
+      port_pd_server_1b_port_1_network_role_tag:
         type: string
         required: true
         status: SUPPORTED
-      port_pd_server_1b_port_vlan_requirements:
+      port_pd_server_1b_port_1_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
-      subinterface_nested_vlan_net1:
+      port_pd_server_1b_port_1_exCP_naming:
+        type: org.openecomp.datatypes.Naming
+        required: true
+        status: SUPPORTED
+      port_pd_server_1b_port_1_subnetpoolid:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_pd_server_1b_port_1_related_networks:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
-      port_pd_server_1b_port_related_networks:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+      index_value:
+        type: integer
+        description: Index value of this substitution service template runtime instance
+        required: false
+        default: 0
+        status: SUPPORTED
+        constraints:
+        - greater_or_equal: 0
+      port_pd_server_1b_port_1_fixed_ips:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
-      port_pd_server_1b_port_network_role_tag:
-        type: string
+          type: org.openecomp.datatypes.heat.neutron.port.FixedIps
+      port_pd_server_1b_port_1_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
         required: true
         status: SUPPORTED
-      vm_image_name:
+      vm_flavor_name:
         type: string
         required: true
         status: SUPPORTED
-      port_pd_server_1b_port_replacement_policy:
+      subinterface_nested_vlan_net1:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_pd_server_1b_port_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
+      port_pd_server_1b_port_1_order:
+        type: integer
         required: true
         status: SUPPORTED
-      port_pd_server_1b_port_network_role:
+      vm_image_name:
         type: string
         required: true
         status: SUPPORTED
-      subinterface_nested_vlan_parent_interface:
+      port_pd_server_1b_port_1_network:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_pd_server_1b_port_fixed_ips:
+      subinterface_nested_vlan_parent_interface:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.heat.neutron.port.FixedIps
-      port_pd_server_1b_port_network:
+          type: string
+      port_pd_server_1b_port_1_replacement_policy:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      compute_pd_server_1b_availability_zone:
+      port_pd_server_1b_port_1_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
-      port_pd_server_1b_port_order:
-        type: integer
-        required: true
-        status: SUPPORTED
-      port_pd_server_1b_port_exCP_naming:
-        type: org.openecomp.datatypes.Naming
-        required: true
-        status: SUPPORTED
-      port_pd_server_1b_port_ip_requirements:
+          type: org.openecomp.datatypes.network.IpRequirements
+      compute_pd_server_1b_availability_zone:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
-      port_pd_server_1b_port_subnetpoolid:
+          type: string
+      port_pd_server_1b_port_1_network_role:
         type: string
         required: true
         status: SUPPORTED
     requirements:
-    - dependency_pd_server_1b_pd_server_1b_port_nested_vlan:
+    - dependency_pd_server_1b:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan:
+    - local_storage_pd_server_1b:
+        capability: tosca.capabilities.Attachment
+        node: tosca.nodes.BlockStorage
+        relationship: tosca.relationships.AttachesTo
+        occurrences:
+        - 0
+        - UNBOUNDED
+    - dependency_pd_server_1b_pd_server_1b_port_1:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan:
+    - link_pd_server_1b_pd_server_1b_port_1:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
         - 1
         - 1
-    - dependency_pd_server_1b:
+    - dependency_pd_server_1b_pd_server_1b_port_1_nested_vlan:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - local_storage_pd_server_1b:
-        capability: tosca.capabilities.Attachment
-        node: tosca.nodes.BlockStorage
-        relationship: tosca.relationships.AttachesTo
-        occurrences:
-        - 0
-        - UNBOUNDED
-    - dependency_pd_server_1b_pd_server_1b_port:
+    - dependency_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_1_nested_vlan:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_pd_server_1b_pd_server_1b_port:
+    - subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_1_nested_vlan:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
@@ -1028,11 +1028,6 @@ 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:
@@ -1052,28 +1047,25 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_pd_server_1b_pd_server_1b_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
-      cpu.delta_pd_server_1b:
+      network.incoming.packets.rate_pd_server_1b_pd_server_1b_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
-      forwarder_pd_server_1b_pd_server_1b_port:
-        type: org.openecomp.capabilities.Forwarder
-        occurrences:
-        - 1
-        - UNBOUNDED
-      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.
+      binding_pd_server_1b_pd_server_1b_port_1:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface
         occurrences:
-        - 1
+        - 0
         - UNBOUNDED
       disk.device.read.requests_pd_server_1b:
         type: org.openecomp.capabilities.metric.Ceilometer
@@ -1092,14 +1084,6 @@ 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
-        - org.openecomp.resource.cp.nodes.heat.network.v2.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.
@@ -1123,6 +1107,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      network.outpoing.packets_pd_server_1b_pd_server_1b_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
       disk.device.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.
@@ -1135,7 +1125,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_pd_server_1b_pd_server_1b_port:
+      network.incoming.bytes_pd_server_1b_pd_server_1b_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:
@@ -1165,14 +1155,15 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.usage_pd_server_1b:
+      network.incoming.bytes.rate_pd_server_1b_pd_server_1b_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
-      attachment_pd_server_1b_pd_server_1b_port:
-        type: tosca.capabilities.Attachment
+      disk.device.usage_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
@@ -1194,7 +1185,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port:
+      network.outgoing.bytes_pd_server_1b_pd_server_1b_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:
@@ -1211,7 +1202,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      feature_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan:
+      feature_pd_server_1b_pd_server_1b_port_1_nested_vlan:
         type: tosca.capabilities.Node
         occurrences:
         - 1
@@ -1222,6 +1213,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_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
       disk.root.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.
@@ -1234,6 +1231,16 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pd_server_1b_pd_server_1b_port_1:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      feature_pd_server_1b_pd_server_1b_port_1:
+        type: tosca.capabilities.Node
+        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.
@@ -1257,12 +1264,6 @@ 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.
@@ -1274,15 +1275,19 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      feature_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_1_nested_vlan:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
       cpu_util_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.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.
+      attachment_pd_server_1b_pd_server_1b_port_1:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
@@ -1292,12 +1297,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      feature_pd_server_1b_pd_server_1b_port_nested_vlan:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      network.incoming.packets_pd_server_1b_pd_server_1b_port:
+      network.incoming.packets_pd_server_1b_pd_server_1b_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:
@@ -1321,25 +1321,25 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port:
+      disk.capacity_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.capacity_pd_server_1b:
+      disk.usage_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.usage_pd_server_1b:
+      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.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests.rate_pd_server_1b:
+      network.outgoing.packets.rate_pd_server_1b_pd_server_1b_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:
@@ -1411,4 +1411,4 @@ node_types:
         type: tosca.capabilities.Node
         occurrences:
         - 1
-        - UNBOUNDED
\ No newline at end of file
+        - UNBOUNDED
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/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/subinterface/vlantagging/pattern5/complexVFCScalingScenario/out/Nested_pd_server_1bServiceTemplate.yaml
index 17f0ff073f..c0531975e0 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/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/subinterface/vlantagging/pattern5/complexVFCScalingScenario/out/Nested_pd_server_1bServiceTemplate.yaml
@@ -21,108 +21,83 @@ topology_template:
       required: true
       entry_schema:
         type: float
-    index_value:
-      type: integer
-      description: Index value of this substitution service template runtime instance
-      required: false
-      default: 0
-      constraints:
-      - greater_or_equal: 0
-    vm_flavor_name:
+    port_pd_server_1b_port_1_network_role_tag:
       type: string
       required: true
-    port_pd_server_1b_port_vlan_requirements:
+    port_pd_server_1b_port_1_vlan_requirements:
       type: list
       required: true
       entry_schema:
         type: org.openecomp.datatypes.network.VlanRequirements
-    subinterface_nested_vlan_net1:
+    port_pd_server_1b_port_1_exCP_naming:
+      type: org.openecomp.datatypes.Naming
+      required: true
+    port_pd_server_1b_port_1_subnetpoolid:
+      type: string
+      required: true
+    port_pd_server_1b_port_1_related_networks:
       type: list
       required: true
       entry_schema:
-        type: string
-    port_pd_server_1b_port_related_networks:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+    index_value:
+      type: integer
+      description: Index value of this substitution service template runtime instance
+      required: false
+      default: 0
+      constraints:
+      - greater_or_equal: 0
+    port_pd_server_1b_port_1_fixed_ips:
       type: list
       required: true
       entry_schema:
-        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
-    port_pd_server_1b_port_network_role_tag:
-      type: string
+        type: org.openecomp.datatypes.heat.neutron.port.FixedIps
+    port_pd_server_1b_port_1_mac_requirements:
+      type: org.openecomp.datatypes.network.MacRequirements
       required: true
-    vm_image_name:
+    vm_flavor_name:
       type: string
       required: true
-    port_pd_server_1b_port_replacement_policy:
+    subinterface_nested_vlan_net1:
       type: list
       required: true
       entry_schema:
         type: string
-    port_pd_server_1b_port_mac_requirements:
-      type: org.openecomp.datatypes.network.MacRequirements
+    port_pd_server_1b_port_1_order:
+      type: integer
       required: true
-    port_pd_server_1b_port_network_role:
+    vm_image_name:
       type: string
       required: true
-    subinterface_nested_vlan_parent_interface:
+    port_pd_server_1b_port_1_network:
       type: list
       required: true
       entry_schema:
         type: string
-    port_pd_server_1b_port_fixed_ips:
+    subinterface_nested_vlan_parent_interface:
       type: list
       required: true
       entry_schema:
-        type: org.openecomp.datatypes.heat.neutron.port.FixedIps
-    port_pd_server_1b_port_network:
+        type: string
+    port_pd_server_1b_port_1_replacement_policy:
       type: list
       required: true
       entry_schema:
         type: string
-    compute_pd_server_1b_availability_zone:
+    port_pd_server_1b_port_1_ip_requirements:
       type: list
       required: true
       entry_schema:
-        type: string
-    port_pd_server_1b_port_order:
-      type: integer
-      required: true
-    port_pd_server_1b_port_exCP_naming:
-      type: org.openecomp.datatypes.Naming
-      required: true
-    port_pd_server_1b_port_ip_requirements:
+        type: org.openecomp.datatypes.network.IpRequirements
+    compute_pd_server_1b_availability_zone:
       type: list
       required: true
       entry_schema:
-        type: org.openecomp.datatypes.network.IpRequirements
-    port_pd_server_1b_port_subnetpoolid:
+        type: string
+    port_pd_server_1b_port_1_network_role:
       type: string
       required: true
   node_templates:
-    pd_server_1b_pd_server_1b_port_nested_vlan:
-      type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested_vlan
-      directives:
-      - substitutable
-      properties:
-        service_template_filter:
-          count:
-            get_input:
-            - subinterface_nested_vlan_service_template_filter_count
-            - index_value
-          substitute_service_template: nested_vlanServiceTemplate.yaml
-          mandatory: true
-        parent_interface:
-          get_input:
-          - subinterface_nested_vlan_parent_interface
-          - index_value
-        net1:
-          get_input:
-          - subinterface_nested_vlan_net1
-          - index_value
-      requirements:
-      - binding_template_Vlan_vmi_1:
-          capability: tosca.capabilities.network.Bindable
-          node: pd_server_1b_pd_server_1b_port
-          relationship: tosca.relationships.network.BindsTo
     pd_server_1b:
       type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server_1b
       properties:
@@ -138,54 +113,76 @@ topology_template:
           get_input:
           - compute_pd_server_1b_name
           - index_value
-    pd_server_1b_pd_server_1b_port:
+    pd_server_1b_pd_server_1b_port_1:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         replacement_policy:
           get_input:
-          - port_pd_server_1b_port_replacement_policy
+          - port_pd_server_1b_port_1_replacement_policy
           - index_value
         mac_requirements:
-          get_input: port_pd_server_1b_port_mac_requirements
+          get_input: port_pd_server_1b_port_1_mac_requirements
         order:
-          get_input: port_pd_server_1b_port_order
+          get_input: port_pd_server_1b_port_1_order
         exCP_naming:
-          get_input: port_pd_server_1b_port_exCP_naming
+          get_input: port_pd_server_1b_port_1_exCP_naming
         vlan_requirements:
-          get_input: port_pd_server_1b_port_vlan_requirements
+          get_input: port_pd_server_1b_port_1_vlan_requirements
         subinterface_indicator: true
         ip_requirements:
-          get_input: port_pd_server_1b_port_ip_requirements
+          get_input: port_pd_server_1b_port_1_ip_requirements
         related_networks:
-          get_input: port_pd_server_1b_port_related_networks
+          get_input: port_pd_server_1b_port_1_related_networks
         network_role_tag:
-          get_input: port_pd_server_1b_port_network_role_tag
+          get_input: port_pd_server_1b_port_1_network_role_tag
         network_role:
-          get_input: port_pd_server_1b_port_network_role
+          get_input: port_pd_server_1b_port_1_network_role
         fixed_ips:
           get_input:
-          - port_pd_server_1b_port_fixed_ips
+          - port_pd_server_1b_port_1_fixed_ips
           - index_value
         subnetpoolid:
-          get_input: port_pd_server_1b_port_subnetpoolid
+          get_input: port_pd_server_1b_port_1_subnetpoolid
         network:
           get_input:
-          - port_pd_server_1b_port_network
+          - port_pd_server_1b_port_1_network
           - index_value
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
           node: pd_server_1b
           relationship: tosca.relationships.network.BindsTo
+    pd_server_1b_pd_server_1b_port_1_nested_vlan:
+      type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested_vlan
+      directives:
+      - substitutable
+      properties:
+        service_template_filter:
+          count:
+            get_input:
+            - subinterface_nested_vlan_service_template_filter_count
+            - index_value
+          substitute_service_template: nested_vlanServiceTemplate.yaml
+          mandatory: true
+        parent_interface:
+          get_input:
+          - subinterface_nested_vlan_parent_interface
+          - index_value
+        net1:
+          get_input:
+          - subinterface_nested_vlan_net1
+          - index_value
+      requirements:
+      - binding_template_Vlan_vmi_1:
+          capability: tosca.capabilities.network.Bindable
+          node: pd_server_1b_pd_server_1b_port_1
+          relationship: tosca.relationships.network.BindsTo
   substitution_mappings:
     node_type: org.openecomp.resource.abstract.nodes.pd_server_1b
     capabilities:
       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
@@ -195,18 +192,15 @@ topology_template:
       disk.allocation_pd_server_1b:
       - pd_server_1b
       - disk.allocation
-      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
-      forwarder_pd_server_1b_pd_server_1b_port:
-      - pd_server_1b_pd_server_1b_port
-      - forwarder
-      network.incoming.bytes_pd_server_1b_pd_server_1b_port:
-      - pd_server_1b_pd_server_1b_port
-      - network.incoming.bytes
+      network.incoming.packets.rate_pd_server_1b_pd_server_1b_port_1:
+      - pd_server_1b_pd_server_1b_port_1
+      - network.incoming.packets.rate
+      binding_pd_server_1b_pd_server_1b_port_1:
+      - pd_server_1b_pd_server_1b_port_1
+      - binding
       disk.device.read.requests_pd_server_1b:
       - pd_server_1b
       - disk.device.read.requests
@@ -216,9 +210,6 @@ 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
@@ -231,15 +222,18 @@ topology_template:
       endpoint_pd_server_1b:
       - pd_server_1b
       - endpoint
+      network.outpoing.packets_pd_server_1b_pd_server_1b_port_1:
+      - pd_server_1b_pd_server_1b_port_1
+      - network.outpoing.packets
       disk.device.allocation_pd_server_1b:
       - pd_server_1b
       - disk.device.allocation
       memory.usage_pd_server_1b:
       - pd_server_1b
       - memory.usage
-      network.outpoing.packets_pd_server_1b_pd_server_1b_port:
-      - pd_server_1b_pd_server_1b_port
-      - network.outpoing.packets
+      network.incoming.bytes_pd_server_1b_pd_server_1b_port_1:
+      - pd_server_1b_pd_server_1b_port_1
+      - network.incoming.bytes
       memory_pd_server_1b:
       - pd_server_1b
       - memory
@@ -252,12 +246,12 @@ topology_template:
       disk.read.bytes_pd_server_1b:
       - pd_server_1b
       - disk.read.bytes
+      network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port_1:
+      - pd_server_1b_pd_server_1b_port_1
+      - network.incoming.bytes.rate
       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
@@ -267,27 +261,36 @@ topology_template:
       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
+      network.outgoing.bytes_pd_server_1b_pd_server_1b_port_1:
+      - pd_server_1b_pd_server_1b_port_1
+      - network.outgoing.bytes
       scalable_pd_server_1b:
       - pd_server_1b
       - scalable
       disk.write.requests_pd_server_1b:
       - pd_server_1b
       - disk.write.requests
-      feature_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan:
-      - pd_server_1b_pd_server_1b_port_nested_vlan
-      - feature_template_Vlan_vmi_1
+      feature_pd_server_1b_pd_server_1b_port_1_nested_vlan:
+      - pd_server_1b_pd_server_1b_port_1_nested_vlan
+      - feature
       disk.device.write.bytes.rate_pd_server_1b:
       - pd_server_1b
       - disk.device.write.bytes.rate
+      network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port_1:
+      - pd_server_1b_pd_server_1b_port_1
+      - network.outgoing.bytes.rate
       disk.root.size_pd_server_1b:
       - pd_server_1b
       - disk.root.size
       disk.iops_pd_server_1b:
       - pd_server_1b
       - disk.iops
+      forwarder_pd_server_1b_pd_server_1b_port_1:
+      - pd_server_1b_pd_server_1b_port_1
+      - forwarder
+      feature_pd_server_1b_pd_server_1b_port_1:
+      - pd_server_1b_pd_server_1b_port_1
+      - feature
       disk.write.bytes_pd_server_1b:
       - pd_server_1b
       - disk.write.bytes
@@ -300,29 +303,26 @@ 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
       binding_pd_server_1b:
       - pd_server_1b
       - binding
+      feature_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_1_nested_vlan:
+      - pd_server_1b_pd_server_1b_port_1_nested_vlan
+      - feature_template_Vlan_vmi_1
       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
+      attachment_pd_server_1b_pd_server_1b_port_1:
+      - pd_server_1b_pd_server_1b_port_1
+      - attachment
       memory.resident_pd_server_1b:
       - pd_server_1b
       - memory.resident
-      feature_pd_server_1b_pd_server_1b_port_nested_vlan:
-      - pd_server_1b_pd_server_1b_port_nested_vlan
-      - feature
-      network.incoming.packets_pd_server_1b_pd_server_1b_port:
-      - pd_server_1b_pd_server_1b_port
+      network.incoming.packets_pd_server_1b_pd_server_1b_port_1:
+      - pd_server_1b_pd_server_1b_port_1
       - network.incoming.packets
       disk.device.write.requests.rate_pd_server_1b:
       - pd_server_1b
@@ -333,9 +333,6 @@ topology_template:
       disk.read.requests_pd_server_1b:
       - pd_server_1b
       - disk.read.requests
-      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
@@ -345,6 +342,9 @@ topology_template:
       disk.write.requests.rate_pd_server_1b:
       - pd_server_1b
       - disk.write.requests.rate
+      network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port_1:
+      - pd_server_1b_pd_server_1b_port_1
+      - network.outgoing.packets.rate
     requirements:
       dependency_pd_server_1b:
       - pd_server_1b
@@ -352,18 +352,18 @@ topology_template:
       local_storage_pd_server_1b:
       - pd_server_1b
       - local_storage
-      link_pd_server_1b_pd_server_1b_port:
-      - pd_server_1b_pd_server_1b_port
+      link_pd_server_1b_pd_server_1b_port_1:
+      - pd_server_1b_pd_server_1b_port_1
       - link
-      dependency_pd_server_1b_pd_server_1b_port_nested_vlan:
-      - pd_server_1b_pd_server_1b_port_nested_vlan
+      dependency_pd_server_1b_pd_server_1b_port_1_nested_vlan:
+      - pd_server_1b_pd_server_1b_port_1_nested_vlan
       - dependency
-      dependency_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan:
-      - pd_server_1b_pd_server_1b_port_nested_vlan
+      dependency_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_1_nested_vlan:
+      - pd_server_1b_pd_server_1b_port_1_nested_vlan
       - dependency_template_Vlan_vmi_1
-      subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan:
-      - pd_server_1b_pd_server_1b_port_nested_vlan
+      dependency_pd_server_1b_pd_server_1b_port_1:
+      - pd_server_1b_pd_server_1b_port_1
+      - dependency
+      subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_1_nested_vlan:
+      - pd_server_1b_pd_server_1b_port_1_nested_vlan
       - subinterface_link_template_Vlan_vmi_1
-      dependency_pd_server_1b_pd_server_1b_port:
-      - pd_server_1b_pd_server_1b_port
-      - 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/subinterface/vlantagging/pattern5/complexVFCScalingScenario/out/nested_pattern5ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/out/nested_pattern5ServiceTemplate.yaml
index b822c5efa3..1eac7cb338 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/out/nested_pattern5ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/out/nested_pattern5ServiceTemplate.yaml
@@ -119,23 +119,7 @@ topology_template:
         subinterface_nested_vlan_service_template_filter_count:
         - 9
         - 9
-        vm_flavor_name:
-          get_input: pd_server_1b_flavor
-        subinterface_nested_vlan_net1:
-        - packet_external_network
-        - packet_external_network
-        vm_image_name:
-          get_input: pd_server_1b_image
-        port_pd_server_1b_port_replacement_policy:
-        - AUTO
-        - AUTO
-        port_pd_server_1b_port_mac_requirements:
-          mac_count_required:
-            is_required: false
-        subinterface_nested_vlan_parent_interface:
-        - pd_server_1b_port_0
-        - pd_server_1b_port_1
-        port_pd_server_1b_port_fixed_ips:
+        port_pd_server_1b_port_1_fixed_ips:
         - - ip_address:
               get_input:
               - pd_server_1b_ips
@@ -144,18 +128,34 @@ topology_template:
               get_input:
               - pd_server_1b_ips
               - 0
-        port_pd_server_1b_port_network:
+        port_pd_server_1b_port_1_mac_requirements:
+          mac_count_required:
+            is_required: false
+        vm_flavor_name:
+          get_input: pd_server_1b_flavor
+        subinterface_nested_vlan_net1:
+        - packet_external_network
+        - packet_external_network
+        vm_image_name:
+          get_input: pd_server_1b_image
+        port_pd_server_1b_port_1_network:
         - packet_internal_network
         - packet_internal_network
-        compute_pd_server_1b_availability_zone:
-        - get_input: availability_zone_0
-        - get_input: availability_zone_0
-        port_pd_server_1b_port_ip_requirements:
+        subinterface_nested_vlan_parent_interface:
+        - pd_server_1b_1_port_1
+        - pd_server_1b_port_1
+        port_pd_server_1b_port_1_replacement_policy:
+        - AUTO
+        - AUTO
+        port_pd_server_1b_port_1_ip_requirements:
         - ip_version: 4
           ip_count_required:
             is_required: true
           floating_ip_count_required:
             is_required: false
+        compute_pd_server_1b_availability_zone:
+        - get_input: availability_zone_0
+        - get_input: availability_zone_0
         service_template_filter:
           substitute_service_template: Nested_pd_server_1bServiceTemplate.yaml
           count: 2
@@ -165,11 +165,11 @@ topology_template:
           - service_template_filter
           - index_value
       requirements:
-      - link_pd_server_1b_pd_server_1b_port:
+      - link_pd_server_1b_pd_server_1b_port_1:
           capability: tosca.capabilities.network.Linkable
           node: packet_internal_network
           relationship: tosca.relationships.network.LinksTo
-      - subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan:
+      - subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_1_nested_vlan:
           capability: tosca.capabilities.network.Linkable
           node: packet_external_network
           relationship: tosca.relationships.network.LinksTo
@@ -192,30 +192,21 @@ topology_template:
       disk.device.write.requests_server_1b_pd_1:
       - abstract_pd_server_1b
       - disk.device.write.requests_pd_server_1b
-      forwarder_pd_server_1b_port_0:
-      - abstract_pd_server_1b
-      - forwarder_pd_server_1b_pd_server_1b_port
       disk.capacity_server_1b_pd_1:
       - abstract_pd_server_1b
       - disk.capacity_pd_server_1b
       forwarder_pd_server_1b_port_1:
       - abstract_pd_server_1b
-      - forwarder_pd_server_1b_pd_server_1b_port
+      - forwarder_pd_server_1b_pd_server_1b_port_1
       disk.capacity_server_1b_pd_0:
       - abstract_pd_server_1b
       - disk.capacity_pd_server_1b
-      network.outpoing.packets_pd_server_1b_port_0:
-      - abstract_pd_server_1b
-      - network.outpoing.packets_pd_server_1b_pd_server_1b_port
       network.outpoing.packets_pd_server_1b_port_1:
       - abstract_pd_server_1b
-      - network.outpoing.packets_pd_server_1b_pd_server_1b_port
-      feature_pd_server_1b_port_0:
-      - abstract_pd_server_1b
-      - feature_pd_server_1b_pd_server_1b_port
+      - network.outpoing.packets_pd_server_1b_pd_server_1b_port_1
       feature_pd_server_1b_port_1:
       - abstract_pd_server_1b
-      - feature_pd_server_1b_pd_server_1b_port
+      - feature_pd_server_1b_pd_server_1b_port_1
       attachment_packet_internal_network:
       - packet_internal_network
       - attachment
@@ -330,12 +321,24 @@ topology_template:
       binding_server_1b_pd_1:
       - abstract_pd_server_1b
       - binding_pd_server_1b
-      network.outgoing.bytes_pd_server_1b_port_0:
+      network.outgoing.bytes_pd_server_1b_1_port_1:
       - abstract_pd_server_1b
-      - network.outgoing.bytes_pd_server_1b_pd_server_1b_port
+      - network.outgoing.bytes_pd_server_1b_pd_server_1b_port_1
+      network.outgoing.packets.rate_pd_server_1b_1_port_1:
+      - abstract_pd_server_1b
+      - network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port_1
+      attachment_pd_server_1b_1_port_1:
+      - abstract_pd_server_1b
+      - attachment_pd_server_1b_pd_server_1b_port_1
       network.outgoing.bytes_pd_server_1b_port_1:
       - abstract_pd_server_1b
-      - network.outgoing.bytes_pd_server_1b_pd_server_1b_port
+      - network.outgoing.bytes_pd_server_1b_pd_server_1b_port_1
+      network.incoming.packets.rate_pd_server_1b_1_port_1:
+      - abstract_pd_server_1b
+      - network.incoming.packets.rate_pd_server_1b_pd_server_1b_port_1
+      network.incoming.bytes.rate_pd_server_1b_1_port_1:
+      - abstract_pd_server_1b
+      - network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port_1
       link_packet_external_network:
       - packet_external_network
       - link
@@ -344,13 +347,10 @@ topology_template:
       - memory.resident_pd_server_1b
       attachment_pd_server_1b_port_1:
       - abstract_pd_server_1b
-      - attachment_pd_server_1b_pd_server_1b_port
+      - attachment_pd_server_1b_pd_server_1b_port_1
       network.outgoing.packets.rate_pd_server_1b_port_1:
       - abstract_pd_server_1b
-      - network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port
-      network.outgoing.packets.rate_pd_server_1b_port_0:
-      - abstract_pd_server_1b
-      - network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port
+      - network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port_1
       memory.resident_server_1b_pd_1:
       - abstract_pd_server_1b
       - memory.resident_pd_server_1b
@@ -360,21 +360,24 @@ topology_template:
       disk.device.read.bytes_server_1b_pd_0:
       - abstract_pd_server_1b
       - disk.device.read.bytes_pd_server_1b
-      attachment_pd_server_1b_port_0:
-      - abstract_pd_server_1b
-      - attachment_pd_server_1b_pd_server_1b_port
       disk.ephemeral.size_server_1b_pd_0:
       - abstract_pd_server_1b
       - disk.ephemeral.size_pd_server_1b
       disk.ephemeral.size_server_1b_pd_1:
       - abstract_pd_server_1b
       - disk.ephemeral.size_pd_server_1b
+      network.incoming.bytes_pd_server_1b_1_port_1:
+      - abstract_pd_server_1b
+      - network.incoming.bytes_pd_server_1b_pd_server_1b_port_1
       end_point_packet_internal_network:
       - packet_internal_network
       - end_point
       feature_packet_internal_network:
       - packet_internal_network
       - feature
+      network.outgoing.bytes.rate_pd_server_1b_1_port_1:
+      - abstract_pd_server_1b
+      - network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port_1
       instance_server_1b_pd_0:
       - abstract_pd_server_1b
       - instance_pd_server_1b
@@ -389,13 +392,7 @@ topology_template:
       - disk.device.capacity_pd_server_1b
       network.outgoing.bytes.rate_pd_server_1b_port_1:
       - abstract_pd_server_1b
-      - network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port
-      network.outgoing.bytes.rate_pd_server_1b_port_0:
-      - abstract_pd_server_1b
-      - network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port
-      network.incoming.packets.rate_pd_server_1b_port_0:
-      - abstract_pd_server_1b
-      - network.incoming.packets.rate_pd_server_1b_pd_server_1b_port
+      - network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port_1
       os_server_1b_pd_1:
       - abstract_pd_server_1b
       - os_pd_server_1b
@@ -408,9 +405,12 @@ topology_template:
       disk.read.bytes_server_1b_pd_0:
       - abstract_pd_server_1b
       - disk.read.bytes_pd_server_1b
+      network.outpoing.packets_pd_server_1b_1_port_1:
+      - abstract_pd_server_1b
+      - network.outpoing.packets_pd_server_1b_pd_server_1b_port_1
       network.incoming.packets.rate_pd_server_1b_port_1:
       - abstract_pd_server_1b
-      - network.incoming.packets.rate_pd_server_1b_pd_server_1b_port
+      - network.incoming.packets.rate_pd_server_1b_pd_server_1b_port_1
       disk.read.bytes_server_1b_pd_1:
       - abstract_pd_server_1b
       - disk.read.bytes_pd_server_1b
@@ -419,16 +419,13 @@ topology_template:
       - endpoint_pd_server_1b
       network.incoming.bytes_pd_server_1b_port_1:
       - abstract_pd_server_1b
-      - network.incoming.bytes_pd_server_1b_pd_server_1b_port
+      - network.incoming.bytes_pd_server_1b_pd_server_1b_port_1
       host_server_1b_pd_1:
       - abstract_pd_server_1b
       - host_pd_server_1b
       host_server_1b_pd_0:
       - abstract_pd_server_1b
       - host_pd_server_1b
-      network.incoming.bytes_pd_server_1b_port_0:
-      - abstract_pd_server_1b
-      - network.incoming.bytes_pd_server_1b_pd_server_1b_port
       disk.root.size_server_1b_pd_1:
       - abstract_pd_server_1b
       - disk.root.size_pd_server_1b
@@ -456,18 +453,21 @@ topology_template:
       disk.allocation_server_1b_pd_1:
       - abstract_pd_server_1b
       - disk.allocation_pd_server_1b
+      binding_pd_server_1b_1_port_1:
+      - abstract_pd_server_1b
+      - binding_pd_server_1b_pd_server_1b_port_1
       disk.allocation_server_1b_pd_0:
       - abstract_pd_server_1b
       - disk.allocation_pd_server_1b
-      binding_pd_server_1b_port_0:
+      forwarder_pd_server_1b_1_port_1:
       - abstract_pd_server_1b
-      - binding_pd_server_1b_pd_server_1b_port
+      - forwarder_pd_server_1b_pd_server_1b_port_1
       disk.device.latency_server_1b_pd_1:
       - abstract_pd_server_1b
       - disk.device.latency_pd_server_1b
       binding_pd_server_1b_port_1:
       - abstract_pd_server_1b
-      - binding_pd_server_1b_pd_server_1b_port
+      - binding_pd_server_1b_pd_server_1b_port_1
       disk.device.read.requests.rate_server_1b_pd_0:
       - abstract_pd_server_1b
       - disk.device.read.requests.rate_pd_server_1b
@@ -492,6 +492,9 @@ topology_template:
       cpu.delta_server_1b_pd_0:
       - abstract_pd_server_1b
       - cpu.delta_pd_server_1b
+      network.incoming.packets_pd_server_1b_1_port_1:
+      - abstract_pd_server_1b
+      - network.incoming.packets_pd_server_1b_pd_server_1b_port_1
       cpu.delta_server_1b_pd_1:
       - abstract_pd_server_1b
       - cpu.delta_pd_server_1b
@@ -504,15 +507,15 @@ topology_template:
       disk.device.read.requests_server_1b_pd_0:
       - abstract_pd_server_1b
       - disk.device.read.requests_pd_server_1b
+      feature_pd_server_1b_1_port_1:
+      - abstract_pd_server_1b
+      - feature_pd_server_1b_pd_server_1b_port_1
       network.incoming.packets_pd_server_1b_port_1:
       - abstract_pd_server_1b
-      - network.incoming.packets_pd_server_1b_pd_server_1b_port
+      - network.incoming.packets_pd_server_1b_pd_server_1b_port_1
       vcpus_server_1b_pd_1:
       - abstract_pd_server_1b
       - vcpus_pd_server_1b
-      network.incoming.packets_pd_server_1b_port_0:
-      - abstract_pd_server_1b
-      - network.incoming.packets_pd_server_1b_pd_server_1b_port
       disk.read.bytes.rate_server_1b_pd_1:
       - abstract_pd_server_1b
       - disk.read.bytes.rate_pd_server_1b
@@ -530,16 +533,13 @@ topology_template:
       - attachment
       network.incoming.bytes.rate_pd_server_1b_port_1:
       - abstract_pd_server_1b
-      - network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port
+      - network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port_1
       disk.latency_server_1b_pd_1:
       - abstract_pd_server_1b
       - disk.latency_pd_server_1b
       disk.latency_server_1b_pd_0:
       - abstract_pd_server_1b
       - disk.latency_pd_server_1b
-      network.incoming.bytes.rate_pd_server_1b_port_0:
-      - abstract_pd_server_1b
-      - network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port
     requirements:
       dependency_test_resourceGroup_1:
       - test_resourceGroup_1
@@ -556,15 +556,15 @@ topology_template:
       dependency_template_Vlan_vmi_1_test_resourceGroup_1:
       - test_resourceGroup_1
       - dependency_template_Vlan_vmi_1
-      dependency_pd_server_1b_port_0:
-      - abstract_pd_server_1b
-      - dependency_pd_server_1b_pd_server_1b_port
       local_storage_server_1b_pd_1:
       - abstract_pd_server_1b
       - local_storage_pd_server_1b
       dependency_server_1b_pd_0:
       - abstract_pd_server_1b
       - dependency_pd_server_1b
+      dependency_pd_server_1b_1_port_1:
+      - abstract_pd_server_1b
+      - dependency_pd_server_1b_pd_server_1b_port_1
       dependency_server_1b_pd_1:
       - abstract_pd_server_1b
       - dependency_pd_server_1b
@@ -573,7 +573,7 @@ topology_template:
       - dependency_template_Vlan_vmi_1
       dependency_pd_server_1b_port_1:
       - abstract_pd_server_1b
-      - dependency_pd_server_1b_pd_server_1b_port
+      - dependency_pd_server_1b_pd_server_1b_port_1
       dependency_packet_external_network:
       - packet_external_network
-      - dependency
\ No newline at end of file
+      - dependency