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>

3 files changed, 431 insertions, 431 deletions

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/allConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/allConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml
index b7b6ef9288..0156a9af57 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/allConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/allConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -8,31 +8,43 @@ node_types:
   org.openecomp.resource.abstract.nodes.vdbe:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
+      port_vdbe_untr_1_port_1_order:
+        type: integer
+        required: true
+        status: SUPPORTED
+      port_vdbe_untr_1_port_1_exCP_naming:
+        type: org.openecomp.datatypes.Naming
+        required: true
+        status: SUPPORTED
       subinterface_vlan1_aap_untrusted_v6_ip_prefix:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      subinterface_vlan1_aap_sec_untrusted_ip_prefix:
+      port_vdbe_untr_2_port_1_network_role_tag:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_vdbe_untr_1_port_1_virtual_machine_interface_mac_addresses:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
-      compute_vdbe_availability_zone:
+          type: json
+      subinterface_vlan1_aap_sec_untrusted_ip_prefix:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_vdbe_untr_2_port_virtual_machine_interface_mac_addresses:
+      compute_vdbe_availability_zone:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
-      port_vdbe_untr_2_port_network_role_tag:
+          type: string
+      port_vdbe_untr_1_port_1_network_role:
         type: string
         required: true
         status: SUPPORTED
@@ -40,71 +52,67 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
-      subinterface_vlan1_counter:
+      port_vdbe_untr_1_port_1_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: float
-      vm_image_name:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_vdbe_untr_2_port_network_role:
-        type: string
-        required: true
-        status: SUPPORTED
-      compute_vdbe_metadata:
+          type: org.openecomp.datatypes.network.IpRequirements
+      port_vdbe_untr_1_port_1_name:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
-      subinterface_vlan1_aap_untrusted_v6_ip_prefix_len:
+          type: string
+      port_vdbe_untr_2_port_1_name:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_vdbe_untr_1_port_ip_requirements:
+      port_vdbe_untr_2_port_1_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
-      port_vdbe_untr_2_port_vlan_requirements:
+          type: org.openecomp.datatypes.network.VlanRequirements
+      subinterface_vlan1_counter:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
-      port_vdbe_untr_2_port_exCP_naming:
-        type: org.openecomp.datatypes.Naming
+          type: float
+      vm_image_name:
+        type: string
         required: true
         status: SUPPORTED
-      port_vdbe_untr_2_port_ip_requirements:
+      compute_vdbe_metadata:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
-      port_vdbe_untr_1_port_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
+          type: json
+      subinterface_vlan1_aap_untrusted_v6_ip_prefix_len:
+        type: list
         required: true
         status: SUPPORTED
-      port_vdbe_untr_1_port_order:
-        type: integer
+        entry_schema:
+          type: string
+      port_vdbe_untr_2_port_1_virtual_machine_interface_mac_addresses:
+        type: list
         required: true
         status: SUPPORTED
-      port_vdbe_untr_1_port_subnetpoolid:
-        type: string
+        entry_schema:
+          type: json
+      port_vdbe_untr_2_port_1_virtual_machine_interface_allowed_address_pairs:
+        type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs
         required: true
         status: SUPPORTED
-      port_vdbe_untr_2_port_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
+      port_vdbe_untr_2_port_1_network_role:
+        type: string
         required: true
         status: SUPPORTED
-      port_vdbe_untr_1_port_virtual_machine_interface_allowed_address_pairs:
+      port_vdbe_untr_1_port_1_virtual_machine_interface_allowed_address_pairs:
         type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs
         required: true
         status: SUPPORTED
@@ -120,6 +128,10 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_vdbe_untr_1_port_1_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
+        required: true
+        status: SUPPORTED
       subinterface_vlan1_ip_address:
         type: list
         required: true
@@ -132,76 +144,68 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      port_vdbe_untr_1_port_network_role_tag:
+      port_vdbe_untr_2_port_1_subnetpoolid:
         type: string
         required: true
         status: SUPPORTED
-      subinterface_vlan1_ip_v6_address:
-        type: list
+      port_vdbe_untr_2_port_1_order:
+        type: integer
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
-      port_vdbe_untr_1_port_related_networks:
+      port_vdbe_untr_2_port_1_related_networks:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
-      subinterface_vlan1_aap_untrusted_ip_prefix:
+      port_vdbe_untr_2_port_1_virtual_network_refs:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
-      port_vdbe_untr_2_port_virtual_network_refs:
+          type: json
+      port_vdbe_untr_2_port_1_exCP_naming:
+        type: org.openecomp.datatypes.Naming
+        required: true
+        status: SUPPORTED
+      subinterface_vlan1_ip_v6_address:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
-      subinterface_vlan1_subinterfaces_name_prefix:
+          type: string
+      subinterface_vlan1_aap_untrusted_ip_prefix:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_vdbe_untr_1_port_network_role:
+      port_vdbe_untr_1_port_1_network_role_tag:
         type: string
         required: true
         status: SUPPORTED
-      port_vdbe_untr_2_port_name:
+      subinterface_vlan1_subinterfaces_name_prefix:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_vdbe_untr_2_port_related_networks:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
-      port_vdbe_untr_1_port_virtual_network_refs:
-        type: list
+      port_vdbe_untr_1_port_1_subnetpoolid:
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: json
       subinterface_vlan1_vn_network_list:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_vdbe_untr_2_port_subnetpoolid:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_vdbe_untr_2_port_order:
-        type: integer
+      port_vdbe_untr_1_port_1_vlan_requirements:
+        type: list
         required: true
         status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.VlanRequirements
       subinterface_vlan1_service_template_filter_count:
         type: list
         required: true
@@ -220,6 +224,10 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_vdbe_untr_2_port_1_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
+        required: true
+        status: SUPPORTED
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
@@ -228,45 +236,37 @@ node_types:
         status: SUPPORTED
         constraints:
         - greater_or_equal: 0
-      port_vdbe_untr_1_port_exCP_naming:
-        type: org.openecomp.datatypes.Naming
-        required: true
-        status: SUPPORTED
       subinterface_vlan1_optional_property_1:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_vdbe_untr_1_port_name:
+      port_vdbe_untr_2_port_1_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
-      subinterface_vlan1_optional_property_2:
+          type: org.openecomp.datatypes.network.IpRequirements
+      port_vdbe_untr_1_port_1_related_networks:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
-      subinterface_vlan1_aap_sec_untrusted_ip_prefix_len:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+      subinterface_vlan1_optional_property_2:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_vdbe_untr_2_port_virtual_machine_interface_allowed_address_pairs:
-        type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs
-        required: true
-        status: SUPPORTED
-      port_vdbe_untr_1_port_vlan_requirements:
+      subinterface_vlan1_aap_sec_untrusted_ip_prefix_len:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
-      port_vdbe_untr_1_port_virtual_machine_interface_mac_addresses:
+          type: string
+      port_vdbe_untr_1_port_1_virtual_network_refs:
         type: list
         required: true
         status: SUPPORTED
@@ -279,7 +279,7 @@ node_types:
         entry_schema:
           type: json
     attributes:
-      vdbe_vdbe_untr_1_port_vlan1_aap_address_mode:
+      vdbe_vdbe_untr_1_port_1_vlan1_aap_address_mode:
         type: string
         status: SUPPORTED
     requirements:
@@ -297,47 +297,47 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_vdbe_vdbe_untr_2_port:
+    - dependency_vdbe_vdbe_untr_1_port_1_vlan1:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_vdbe_vdbe_untr_2_port:
-        capability: tosca.capabilities.network.Linkable
-        relationship: tosca.relationships.network.LinksTo
-        occurrences:
-        - 1
-        - 1
-    - dependency_vdbe_vdbe_untr_1_port_vlan1:
+    - dependency_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_1_port_1_vlan1:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_1_port_vlan1:
+    - subinterface_link_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_1_port_1_vlan1:
+        capability: tosca.capabilities.network.Linkable
+        relationship: tosca.relationships.network.LinksTo
+        occurrences:
+        - 1
+        - 1
+    - dependency_vdbe_vdbe_untr_1_port_1:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - subinterface_link_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_1_port_vlan1:
+    - link_vdbe_vdbe_untr_1_port_1:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
         - 1
         - 1
-    - dependency_vdbe_vdbe_untr_1_port:
+    - dependency_vdbe_vdbe_untr_2_port_1:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_vdbe_vdbe_untr_1_port:
+    - link_vdbe_vdbe_untr_2_port_1:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
@@ -366,13 +366,15 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      feature_vdbe_vdbe_untr_2_port:
-        type: tosca.capabilities.Node
+      network.outpoing.packets_vdbe_vdbe_untr_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
-      feature_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_1_port_vlan1:
-        type: tosca.capabilities.Node
+      network.outpoing.packets_vdbe_vdbe_untr_2_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
@@ -394,47 +396,43 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      feature_vdbe_vdbe_untr_1_port_vlan1:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.device.latency_vdbe:
+      network.outgoing.packets.rate_vdbe_vdbe_untr_2_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.write.requests.rate_vdbe:
+      network.outgoing.packets.rate_vdbe_vdbe_untr_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_vdbe_vdbe_untr_2_port:
+      disk.device.latency_vdbe:
         type: org.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_vdbe_vdbe_untr_1_port:
-        type: tosca.capabilities.Node
+      disk.device.write.requests.rate_vdbe:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes.rate_vdbe:
+      network.incoming.bytes_vdbe_vdbe_untr_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_vdbe_vdbe_untr_1_port:
+      disk.write.bytes.rate_vdbe:
         type: org.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_vdbe_vdbe_untr_1_port:
+      network.outgoing.bytes.rate_vdbe_vdbe_untr_2_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:
@@ -463,79 +461,83 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_vdbe_vdbe_untr_2_port:
+      binding_vdbe_vdbe_untr_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.device.allocation_vdbe:
         type: org.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_vdbe_vdbe_untr_1_port:
+      disk.usage_vdbe:
         type: org.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_vdbe:
+      memory.usage_vdbe:
         type: org.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_vdbe:
+      network.outgoing.bytes_vdbe_vdbe_untr_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
-      memory.usage_vdbe:
+      disk.read.requests_vdbe:
         type: org.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_vdbe_vdbe_untr_2_port:
+      network.incoming.packets.rate_vdbe_vdbe_untr_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.read.requests_vdbe:
+      network.incoming.packets_vdbe_vdbe_untr_2_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_vdbe_vdbe_untr_1_port:
+      network.incoming.bytes.rate_vdbe_vdbe_untr_2_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
-      instance_vdbe:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      forwarder_vdbe_vdbe_untr_1_port_1:
+        type: org.openecomp.capabilities.Forwarder
         occurrences:
         - 1
         - UNBOUNDED
-      cpu.delta_vdbe:
+      instance_vdbe:
         type: org.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_vdbe_vdbe_untr_2_port:
+      cpu.delta_vdbe:
         type: org.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_vdbe_vdbe_untr_1_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
+      forwarder_vdbe_vdbe_untr_2_port_1:
+        type: org.openecomp.capabilities.Forwarder
         occurrences:
-        - 0
+        - 1
         - UNBOUNDED
       disk.device.read.bytes.rate_vdbe:
         type: org.openecomp.capabilities.metric.Ceilometer
@@ -555,17 +557,17 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      forwarder_vdbe_vdbe_untr_1_port:
-        type: org.openecomp.capabilities.Forwarder
-        occurrences:
-        - 1
-        - UNBOUNDED
       disk.write.requests.rate_vdbe:
         type: org.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_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_1_port_1_vlan1:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
       cpu_vdbe:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -578,11 +580,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      forwarder_vdbe_vdbe_untr_2_port:
-        type: org.openecomp.capabilities.Forwarder
-        occurrences:
-        - 1
-        - UNBOUNDED
       disk.device.usage_vdbe:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -595,13 +592,24 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      feature_vdbe_vdbe_untr_2_port_1:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.latency_vdbe:
         type: org.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_vdbe_vdbe_untr_1_port:
+      network.incoming.bytes_vdbe_vdbe_untr_2_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.bytes.rate_vdbe_vdbe_untr_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:
@@ -626,15 +634,8 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_vdbe_vdbe_untr_1_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_vdbe_vdbe_untr_1_port:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_vdbe_vdbe_untr_1_port_1:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
@@ -644,11 +645,13 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_vdbe_vdbe_untr_2_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_vdbe_vdbe_untr_2_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
       os_vdbe:
         type: tosca.capabilities.OperatingSystem
@@ -661,7 +664,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_vdbe_vdbe_untr_2_port:
+      network.outgoing.bytes_vdbe_vdbe_untr_2_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:
@@ -673,44 +676,41 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_vdbe_vdbe_untr_2_port:
+      network.incoming.packets.rate_vdbe_vdbe_untr_2_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
-      binding_vdbe_vdbe_untr_2_port:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface
+      feature_vdbe_vdbe_untr_1_port_1_vlan1:
+        type: tosca.capabilities.Node
         occurrences:
-        - 0
+        - 1
         - UNBOUNDED
-      memory_vdbe:
+      network.incoming.packets_vdbe_vdbe_untr_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
-      binding_vdbe:
-        type: tosca.capabilities.network.Bindable
+      network.incoming.bytes.rate_vdbe_vdbe_untr_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.write.bytes_vdbe:
+      memory_vdbe:
         type: org.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_vdbe_vdbe_untr_2_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_vdbe:
+        type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_vdbe_vdbe_untr_1_port:
+      disk.device.write.bytes_vdbe:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -849,4 +849,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/pattern1c1/allConnectivities/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/allConnectivities/out/MainServiceTemplate.yaml
index 70051fa4b7..0fe1683c3f 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/allConnectivities/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/allConnectivities/out/MainServiceTemplate.yaml
@@ -471,17 +471,35 @@ topology_template:
         subinterface_vlan1_aap_untrusted_v6_ip_prefix:
         - get_input: vdbe_aap_untrusted_v6_ip_prefix
         - get_input: vdbe_aap_untrusted_v6_ip_prefix
+        port_vdbe_untr_1_port_1_virtual_machine_interface_mac_addresses:
+        - - get_input: vdbe_hw_untr_mac_1
+        - - get_input: vdbe_hw_untr_mac_1
         subinterface_vlan1_aap_sec_untrusted_ip_prefix:
         - get_input: vdbe_aap_sec_untrusted_ip_prefix
         - get_input: vdbe_aap_sec_untrusted_ip_prefix
         compute_vdbe_availability_zone:
         - get_input: availability_zone_1
         - get_input: availability_zone_1
-        port_vdbe_untr_2_port_virtual_machine_interface_mac_addresses:
-        - - get_input: vdbe_hw_untr_mac_1
-        - - get_input: vdbe_hw_untr_mac_1
         vm_flavor_name:
           get_input: vdbe_flavor_name
+        port_vdbe_untr_1_port_1_name:
+        - str_replace:
+            template: VM_NAMEDBE001p1n004
+            params:
+              DBE:
+                get_input: vdbe_device_name
+              VM_NAME:
+                get_input: vdbe_name_1
+        - str_replace:
+            template: Port 3
+            params:
+              DBE:
+                get_input: vdbe_device_name
+              VM_NAME:
+                get_input: vdbe_name_1
+        port_vdbe_untr_2_port_1_name:
+        - Port_2
+        - Port_4
         subinterface_vlan1_counter:
         - get_input: counter
         - get_input: counter
@@ -503,6 +521,9 @@ topology_template:
         subinterface_vlan1_aap_untrusted_v6_ip_prefix_len:
         - get_input: vdbe_aap_untrusted_v6_ip_prefix_len
         - get_input: vdbe_aap_untrusted_v6_ip_prefix_len
+        port_vdbe_untr_2_port_1_virtual_machine_interface_mac_addresses:
+        - - get_input: vdbe_hw_untr_mac_1
+        - - get_input: vdbe_hw_untr_mac_1
         subinterface_vlan1_mac_address:
         - get_input: vdbe_hw_untr_mac_1
         - get_input: vdbe_hw_untr_mac_1
@@ -515,15 +536,15 @@ topology_template:
         compute_vdbe_name:
         - get_input: vdbe_name_1
         - get_input: vdbe_name_1
+        port_vdbe_untr_2_port_1_virtual_network_refs:
+        - - fabric_int_net
+        - - fabric_int_net
         subinterface_vlan1_ip_v6_address:
         - get_input: vdbe_untrusted_v6_ip_1
         - get_input: vdbe_untrusted_v6_ip_1
         subinterface_vlan1_aap_untrusted_ip_prefix:
         - get_input: vdbe_aap_untrusted_ip_prefix
         - get_input: vdbe_aap_untrusted_ip_prefix
-        port_vdbe_untr_2_port_virtual_network_refs:
-        - - fabric_int_net
-        - - fabric_int_net
         subinterface_vlan1_subinterfaces_name_prefix:
         - str_replace:
             template: VM_NAMEDBE001p1n004
@@ -539,12 +560,6 @@ topology_template:
                 get_input: vdbe_device_name
               VM_NAME:
                 get_input: vdbe_name_1
-        port_vdbe_untr_2_port_name:
-        - Port_2
-        - Port_4
-        port_vdbe_untr_1_port_virtual_network_refs:
-        - - control_int_net
-        - - control_int_net
         subinterface_vlan1_vn_network_list:
         - control_int_net
         - control_int_net
@@ -553,37 +568,22 @@ topology_template:
         - get_input: untrusted_num_vn
         subinterface_vlan1_parent_interface:
         - vdbe_untr_1_port_1
-        - vdbe_untr_1_port_2
+        - vdbe_1_untr_1_port_1
         subinterface_vlan1_aap_address_mode:
         - get_input: aap_address_mode
         - get_input: aap_address_mode
         subinterface_vlan1_optional_property_1:
         - OPTIONAL_VALUE_SUBPORT_1
         - null
-        port_vdbe_untr_1_port_name:
-        - str_replace:
-            template: VM_NAMEDBE001p1n004
-            params:
-              DBE:
-                get_input: vdbe_device_name
-              VM_NAME:
-                get_input: vdbe_name_1
-        - str_replace:
-            template: Port 3
-            params:
-              DBE:
-                get_input: vdbe_device_name
-              VM_NAME:
-                get_input: vdbe_name_1
         subinterface_vlan1_optional_property_2:
         - null
         - OPTIONAL_VALUE_SUBPORT_2
         subinterface_vlan1_aap_sec_untrusted_ip_prefix_len:
         - get_input: vdbe_aap_sec_untrusted_ip_prefix_len
         - get_input: vdbe_aap_sec_untrusted_ip_prefix_len
-        port_vdbe_untr_1_port_virtual_machine_interface_mac_addresses:
-        - - get_input: vdbe_hw_untr_mac_1
-        - - get_input: vdbe_hw_untr_mac_1
+        port_vdbe_untr_1_port_1_virtual_network_refs:
+        - - control_int_net
+        - - control_int_net
         subinterface_vlan1_vlan_tag_list:
         - get_input: untrusted_vlan_tags
         - get_input: untrusted_vlan_tags
@@ -596,15 +596,15 @@ topology_template:
           - service_template_filter
           - index_value
       requirements:
-      - link_vdbe_vdbe_untr_1_port:
+      - link_vdbe_vdbe_untr_1_port_1:
           capability: tosca.capabilities.network.Linkable
           node: control_int_net
           relationship: tosca.relationships.network.LinksTo
-      - link_vdbe_vdbe_untr_2_port:
+      - link_vdbe_vdbe_untr_2_port_1:
           capability: tosca.capabilities.network.Linkable
           node: fabric_int_net
           relationship: tosca.relationships.network.LinksTo
-      - subinterface_link_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_1_port_vlan1:
+      - subinterface_link_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_1_port_1_vlan1:
           capability: tosca.capabilities.network.Linkable
           node: control_int_net
           relationship: tosca.relationships.network.LinksTo
@@ -625,4 +625,4 @@ topology_template:
       value:
         get_attribute:
         - abstract_vdbe
-        - vdbe_vdbe_untr_1_port_vlan1_aap_address_mode
\ No newline at end of file
+        - vdbe_vdbe_untr_1_port_1_vlan1_aap_address_mode
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/allConnectivities/out/Nested_vdbeServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/allConnectivities/out/Nested_vdbeServiceTemplate.yaml
index 3b803ba26b..c316709067 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/allConnectivities/out/Nested_vdbeServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/allConnectivities/out/Nested_vdbeServiceTemplate.yaml
@@ -11,84 +11,91 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
+    port_vdbe_untr_1_port_1_order:
+      type: integer
+      required: true
+    port_vdbe_untr_1_port_1_exCP_naming:
+      type: org.openecomp.datatypes.Naming
+      required: true
     subinterface_vlan1_aap_untrusted_v6_ip_prefix:
       type: list
       required: true
       entry_schema:
         type: string
-    subinterface_vlan1_aap_sec_untrusted_ip_prefix:
+    port_vdbe_untr_2_port_1_network_role_tag:
+      type: string
+      required: true
+    port_vdbe_untr_1_port_1_virtual_machine_interface_mac_addresses:
       type: list
       required: true
       entry_schema:
-        type: string
-    compute_vdbe_availability_zone:
+        type: json
+    subinterface_vlan1_aap_sec_untrusted_ip_prefix:
       type: list
       required: true
       entry_schema:
         type: string
-    port_vdbe_untr_2_port_virtual_machine_interface_mac_addresses:
+    compute_vdbe_availability_zone:
       type: list
       required: true
       entry_schema:
-        type: json
-    port_vdbe_untr_2_port_network_role_tag:
+        type: string
+    port_vdbe_untr_1_port_1_network_role:
       type: string
       required: true
     vm_flavor_name:
       type: string
       required: true
-    subinterface_vlan1_counter:
+    port_vdbe_untr_1_port_1_ip_requirements:
       type: list
       required: true
       entry_schema:
-        type: float
-    vm_image_name:
-      type: string
-      required: true
-    port_vdbe_untr_2_port_network_role:
-      type: string
-      required: true
-    compute_vdbe_metadata:
+        type: org.openecomp.datatypes.network.IpRequirements
+    port_vdbe_untr_1_port_1_name:
       type: list
       required: true
       entry_schema:
-        type: json
-    subinterface_vlan1_aap_untrusted_v6_ip_prefix_len:
+        type: string
+    port_vdbe_untr_2_port_1_name:
       type: list
       required: true
       entry_schema:
         type: string
-    port_vdbe_untr_1_port_ip_requirements:
+    port_vdbe_untr_2_port_1_vlan_requirements:
       type: list
       required: true
       entry_schema:
-        type: org.openecomp.datatypes.network.IpRequirements
-    port_vdbe_untr_2_port_vlan_requirements:
+        type: org.openecomp.datatypes.network.VlanRequirements
+    subinterface_vlan1_counter:
       type: list
       required: true
       entry_schema:
-        type: org.openecomp.datatypes.network.VlanRequirements
-    port_vdbe_untr_2_port_exCP_naming:
-      type: org.openecomp.datatypes.Naming
+        type: float
+    vm_image_name:
+      type: string
       required: true
-    port_vdbe_untr_2_port_ip_requirements:
+    compute_vdbe_metadata:
       type: list
       required: true
       entry_schema:
-        type: org.openecomp.datatypes.network.IpRequirements
-    port_vdbe_untr_1_port_mac_requirements:
-      type: org.openecomp.datatypes.network.MacRequirements
+        type: json
+    subinterface_vlan1_aap_untrusted_v6_ip_prefix_len:
+      type: list
       required: true
-    port_vdbe_untr_1_port_order:
-      type: integer
+      entry_schema:
+        type: string
+    port_vdbe_untr_2_port_1_virtual_machine_interface_mac_addresses:
+      type: list
       required: true
-    port_vdbe_untr_1_port_subnetpoolid:
-      type: string
+      entry_schema:
+        type: json
+    port_vdbe_untr_2_port_1_virtual_machine_interface_allowed_address_pairs:
+      type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs
       required: true
-    port_vdbe_untr_2_port_mac_requirements:
-      type: org.openecomp.datatypes.network.MacRequirements
+    port_vdbe_untr_2_port_1_network_role:
+      type: string
       required: true
-    port_vdbe_untr_1_port_virtual_machine_interface_allowed_address_pairs:
+    port_vdbe_untr_1_port_1_virtual_machine_interface_allowed_address_pairs:
       type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs
       required: true
     subinterface_vlan1_mac_address:
@@ -101,6 +108,9 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_vdbe_untr_1_port_1_mac_requirements:
+      type: org.openecomp.datatypes.network.MacRequirements
+      required: true
     subinterface_vlan1_ip_address:
       type: list
       required: true
@@ -111,63 +121,56 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    port_vdbe_untr_1_port_network_role_tag:
+    port_vdbe_untr_2_port_1_subnetpoolid:
       type: string
       required: true
-    subinterface_vlan1_ip_v6_address:
-      type: list
+    port_vdbe_untr_2_port_1_order:
+      type: integer
       required: true
-      entry_schema:
-        type: string
-    port_vdbe_untr_1_port_related_networks:
+    port_vdbe_untr_2_port_1_related_networks:
       type: list
       required: true
       entry_schema:
         type: org.openecomp.datatypes.network.RelatedNetworksAssignments
-    subinterface_vlan1_aap_untrusted_ip_prefix:
+    port_vdbe_untr_2_port_1_virtual_network_refs:
       type: list
       required: true
       entry_schema:
-        type: string
-    port_vdbe_untr_2_port_virtual_network_refs:
+        type: json
+    port_vdbe_untr_2_port_1_exCP_naming:
+      type: org.openecomp.datatypes.Naming
+      required: true
+    subinterface_vlan1_ip_v6_address:
       type: list
       required: true
       entry_schema:
-        type: json
-    subinterface_vlan1_subinterfaces_name_prefix:
+        type: string
+    subinterface_vlan1_aap_untrusted_ip_prefix:
       type: list
       required: true
       entry_schema:
         type: string
-    port_vdbe_untr_1_port_network_role:
+    port_vdbe_untr_1_port_1_network_role_tag:
       type: string
       required: true
-    port_vdbe_untr_2_port_name:
+    subinterface_vlan1_subinterfaces_name_prefix:
       type: list
       required: true
       entry_schema:
         type: string
-    port_vdbe_untr_2_port_related_networks:
-      type: list
-      required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
-    port_vdbe_untr_1_port_virtual_network_refs:
-      type: list
+    port_vdbe_untr_1_port_1_subnetpoolid:
+      type: string
       required: true
-      entry_schema:
-        type: json
     subinterface_vlan1_vn_network_list:
       type: list
       required: true
       entry_schema:
         type: string
-    port_vdbe_untr_2_port_subnetpoolid:
-      type: string
-      required: true
-    port_vdbe_untr_2_port_order:
-      type: integer
+    port_vdbe_untr_1_port_1_vlan_requirements:
+      type: list
       required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.VlanRequirements
     subinterface_vlan1_service_template_filter_count:
       type: list
       required: true
@@ -183,6 +186,9 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_vdbe_untr_2_port_1_mac_requirements:
+      type: org.openecomp.datatypes.network.MacRequirements
+      required: true
     index_value:
       type: integer
       description: Index value of this substitution service template runtime instance
@@ -190,38 +196,32 @@ topology_template:
       default: 0
       constraints:
       - greater_or_equal: 0
-    port_vdbe_untr_1_port_exCP_naming:
-      type: org.openecomp.datatypes.Naming
-      required: true
     subinterface_vlan1_optional_property_1:
       type: list
       required: true
       entry_schema:
         type: string
-    port_vdbe_untr_1_port_name:
+    port_vdbe_untr_2_port_1_ip_requirements:
       type: list
       required: true
       entry_schema:
-        type: string
-    subinterface_vlan1_optional_property_2:
+        type: org.openecomp.datatypes.network.IpRequirements
+    port_vdbe_untr_1_port_1_related_networks:
       type: list
       required: true
       entry_schema:
-        type: string
-    subinterface_vlan1_aap_sec_untrusted_ip_prefix_len:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+    subinterface_vlan1_optional_property_2:
       type: list
       required: true
       entry_schema:
         type: string
-    port_vdbe_untr_2_port_virtual_machine_interface_allowed_address_pairs:
-      type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs
-      required: true
-    port_vdbe_untr_1_port_vlan_requirements:
+    subinterface_vlan1_aap_sec_untrusted_ip_prefix_len:
       type: list
       required: true
       entry_schema:
-        type: org.openecomp.datatypes.network.VlanRequirements
-    port_vdbe_untr_1_port_virtual_machine_interface_mac_addresses:
+        type: string
+    port_vdbe_untr_1_port_1_virtual_network_refs:
       type: list
       required: true
       entry_schema:
@@ -251,50 +251,7 @@ topology_template:
           get_input:
           - compute_vdbe_name
           - index_value
-    vdbe_vdbe_untr_2_port:
-      type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface
-      properties:
-        mac_requirements:
-          get_input: port_vdbe_untr_2_port_mac_requirements
-        order:
-          get_input: port_vdbe_untr_2_port_order
-        exCP_naming:
-          get_input: port_vdbe_untr_2_port_exCP_naming
-        virtual_machine_interface_allowed_address_pairs:
-          get_input:
-          - port_vdbe_untr_2_port_virtual_machine_interface_allowed_address_pairs
-          - index_value
-        vlan_requirements:
-          get_input: port_vdbe_untr_2_port_vlan_requirements
-        subinterface_indicator: false
-        related_networks:
-          get_input: port_vdbe_untr_2_port_related_networks
-        virtual_network_refs:
-          get_input:
-          - port_vdbe_untr_2_port_virtual_network_refs
-          - index_value
-        ip_requirements:
-          get_input: port_vdbe_untr_2_port_ip_requirements
-        network_role_tag:
-          get_input: port_vdbe_untr_2_port_network_role_tag
-        virtual_machine_interface_mac_addresses:
-          get_input:
-          - port_vdbe_untr_2_port_virtual_machine_interface_mac_addresses
-          - index_value
-        network_role:
-          get_input: port_vdbe_untr_2_port_network_role
-        subnetpoolid:
-          get_input: port_vdbe_untr_2_port_subnetpoolid
-        name:
-          get_input:
-          - port_vdbe_untr_2_port_name
-          - index_value
-      requirements:
-      - binding:
-          capability: tosca.capabilities.network.Bindable
-          node: vdbe
-          relationship: tosca.relationships.network.BindsTo
-    vdbe_vdbe_untr_1_port_vlan1:
+    vdbe_vdbe_untr_1_port_1_vlan1:
       type: org.openecomp.resource.abstract.nodes.heat.subinterface.vlan1
       directives:
       - substitutable
@@ -381,45 +338,88 @@ topology_template:
       requirements:
       - binding_vdbe_untr_x_vlan1-Network-Role_vmi_subport:
           capability: tosca.capabilities.network.Bindable
-          node: vdbe_vdbe_untr_1_port
+          node: vdbe_vdbe_untr_1_port_1
           relationship: tosca.relationships.network.BindsTo
-    vdbe_vdbe_untr_1_port:
+    vdbe_vdbe_untr_1_port_1:
       type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface
       properties:
         mac_requirements:
-          get_input: port_vdbe_untr_1_port_mac_requirements
+          get_input: port_vdbe_untr_1_port_1_mac_requirements
         order:
-          get_input: port_vdbe_untr_1_port_order
+          get_input: port_vdbe_untr_1_port_1_order
         exCP_naming:
-          get_input: port_vdbe_untr_1_port_exCP_naming
+          get_input: port_vdbe_untr_1_port_1_exCP_naming
         virtual_machine_interface_allowed_address_pairs:
           get_input:
-          - port_vdbe_untr_1_port_virtual_machine_interface_allowed_address_pairs
+          - port_vdbe_untr_1_port_1_virtual_machine_interface_allowed_address_pairs
           - index_value
         vlan_requirements:
-          get_input: port_vdbe_untr_1_port_vlan_requirements
+          get_input: port_vdbe_untr_1_port_1_vlan_requirements
         subinterface_indicator: true
         related_networks:
-          get_input: port_vdbe_untr_1_port_related_networks
+          get_input: port_vdbe_untr_1_port_1_related_networks
+        virtual_network_refs:
+          get_input:
+          - port_vdbe_untr_1_port_1_virtual_network_refs
+          - index_value
+        ip_requirements:
+          get_input: port_vdbe_untr_1_port_1_ip_requirements
+        network_role_tag:
+          get_input: port_vdbe_untr_1_port_1_network_role_tag
+        virtual_machine_interface_mac_addresses:
+          get_input:
+          - port_vdbe_untr_1_port_1_virtual_machine_interface_mac_addresses
+          - index_value
+        network_role:
+          get_input: port_vdbe_untr_1_port_1_network_role
+        subnetpoolid:
+          get_input: port_vdbe_untr_1_port_1_subnetpoolid
+        name:
+          get_input:
+          - port_vdbe_untr_1_port_1_name
+          - index_value
+      requirements:
+      - binding:
+          capability: tosca.capabilities.network.Bindable
+          node: vdbe
+          relationship: tosca.relationships.network.BindsTo
+    vdbe_vdbe_untr_2_port_1:
+      type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface
+      properties:
+        mac_requirements:
+          get_input: port_vdbe_untr_2_port_1_mac_requirements
+        order:
+          get_input: port_vdbe_untr_2_port_1_order
+        exCP_naming:
+          get_input: port_vdbe_untr_2_port_1_exCP_naming
+        virtual_machine_interface_allowed_address_pairs:
+          get_input:
+          - port_vdbe_untr_2_port_1_virtual_machine_interface_allowed_address_pairs
+          - index_value
+        vlan_requirements:
+          get_input: port_vdbe_untr_2_port_1_vlan_requirements
+        subinterface_indicator: false
+        related_networks:
+          get_input: port_vdbe_untr_2_port_1_related_networks
         virtual_network_refs:
           get_input:
-          - port_vdbe_untr_1_port_virtual_network_refs
+          - port_vdbe_untr_2_port_1_virtual_network_refs
           - index_value
         ip_requirements:
-          get_input: port_vdbe_untr_1_port_ip_requirements
+          get_input: port_vdbe_untr_2_port_1_ip_requirements
         network_role_tag:
-          get_input: port_vdbe_untr_1_port_network_role_tag
+          get_input: port_vdbe_untr_2_port_1_network_role_tag
         virtual_machine_interface_mac_addresses:
           get_input:
-          - port_vdbe_untr_1_port_virtual_machine_interface_mac_addresses
+          - port_vdbe_untr_2_port_1_virtual_machine_interface_mac_addresses
           - index_value
         network_role:
-          get_input: port_vdbe_untr_1_port_network_role
+          get_input: port_vdbe_untr_2_port_1_network_role
         subnetpoolid:
-          get_input: port_vdbe_untr_1_port_subnetpoolid
+          get_input: port_vdbe_untr_2_port_1_subnetpoolid
         name:
           get_input:
-          - port_vdbe_untr_1_port_name
+          - port_vdbe_untr_2_port_1_name
           - index_value
       requirements:
       - binding:
@@ -427,11 +427,11 @@ topology_template:
           node: vdbe
           relationship: tosca.relationships.network.BindsTo
   outputs:
-    vdbe_vdbe_untr_1_port_vlan1_aap_address_mode:
+    vdbe_vdbe_untr_1_port_1_vlan1_aap_address_mode:
       type: string
       value:
         get_attribute:
-        - vdbe_vdbe_untr_1_port_vlan1
+        - vdbe_vdbe_untr_1_port_1_vlan1
         - aap_address_mode
   substitution_mappings:
     node_type: org.openecomp.resource.abstract.nodes.vdbe
@@ -448,12 +448,12 @@ topology_template:
       disk.ephemeral.size_vdbe:
       - vdbe
       - disk.ephemeral.size
-      feature_vdbe_vdbe_untr_2_port:
-      - vdbe_vdbe_untr_2_port
-      - feature
-      feature_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_1_port_vlan1:
-      - vdbe_vdbe_untr_1_port_vlan1
-      - feature_vdbe_untr_x_vlan1-Network-Role_vmi_subport
+      network.outpoing.packets_vdbe_vdbe_untr_1_port_1:
+      - vdbe_vdbe_untr_1_port_1
+      - network.outpoing.packets
+      network.outpoing.packets_vdbe_vdbe_untr_2_port_1:
+      - vdbe_vdbe_untr_2_port_1
+      - network.outpoing.packets
       cpu_util_vdbe:
       - vdbe
       - cpu_util
@@ -463,30 +463,27 @@ topology_template:
       disk.write.requests_vdbe:
       - vdbe
       - disk.write.requests
-      feature_vdbe_vdbe_untr_1_port_vlan1:
-      - vdbe_vdbe_untr_1_port_vlan1
-      - feature
+      network.outgoing.packets.rate_vdbe_vdbe_untr_2_port_1:
+      - vdbe_vdbe_untr_2_port_1
+      - network.outgoing.packets.rate
+      network.outgoing.packets.rate_vdbe_vdbe_untr_1_port_1:
+      - vdbe_vdbe_untr_1_port_1
+      - network.outgoing.packets.rate
       disk.device.latency_vdbe:
       - vdbe
       - disk.device.latency
       disk.device.write.requests.rate_vdbe:
       - vdbe
       - disk.device.write.requests.rate
-      network.incoming.packets_vdbe_vdbe_untr_2_port:
-      - vdbe_vdbe_untr_2_port
-      - network.incoming.packets
-      feature_vdbe_vdbe_untr_1_port:
-      - vdbe_vdbe_untr_1_port
-      - feature
+      network.incoming.bytes_vdbe_vdbe_untr_1_port_1:
+      - vdbe_vdbe_untr_1_port_1
+      - network.incoming.bytes
       disk.write.bytes.rate_vdbe:
       - vdbe
       - disk.write.bytes.rate
-      network.incoming.bytes.rate_vdbe_vdbe_untr_1_port:
-      - vdbe_vdbe_untr_1_port
-      - network.incoming.bytes.rate
-      network.incoming.packets.rate_vdbe_vdbe_untr_1_port:
-      - vdbe_vdbe_untr_1_port
-      - network.incoming.packets.rate
+      network.outgoing.bytes.rate_vdbe_vdbe_untr_2_port_1:
+      - vdbe_vdbe_untr_2_port_1
+      - network.outgoing.bytes.rate
       scalable_vdbe:
       - vdbe
       - scalable
@@ -499,12 +496,9 @@ topology_template:
       disk.device.capacity_vdbe:
       - vdbe
       - disk.device.capacity
-      network.outgoing.bytes.rate_vdbe_vdbe_untr_2_port:
-      - vdbe_vdbe_untr_2_port
-      - network.outgoing.bytes.rate
-      network.outgoing.bytes_vdbe_vdbe_untr_1_port:
-      - vdbe_vdbe_untr_1_port
-      - network.outgoing.bytes
+      binding_vdbe_vdbe_untr_1_port_1:
+      - vdbe_vdbe_untr_1_port_1
+      - binding
       disk.device.allocation_vdbe:
       - vdbe
       - disk.device.allocation
@@ -514,27 +508,33 @@ topology_template:
       memory.usage_vdbe:
       - vdbe
       - memory.usage
-      network.outpoing.packets_vdbe_vdbe_untr_2_port:
-      - vdbe_vdbe_untr_2_port
-      - network.outpoing.packets
+      network.outgoing.bytes_vdbe_vdbe_untr_1_port_1:
+      - vdbe_vdbe_untr_1_port_1
+      - network.outgoing.bytes
       disk.read.requests_vdbe:
       - vdbe
       - disk.read.requests
-      network.incoming.bytes_vdbe_vdbe_untr_1_port:
-      - vdbe_vdbe_untr_1_port
-      - network.incoming.bytes
+      network.incoming.packets.rate_vdbe_vdbe_untr_1_port_1:
+      - vdbe_vdbe_untr_1_port_1
+      - network.incoming.packets.rate
+      network.incoming.packets_vdbe_vdbe_untr_2_port_1:
+      - vdbe_vdbe_untr_2_port_1
+      - network.incoming.packets
+      network.incoming.bytes.rate_vdbe_vdbe_untr_2_port_1:
+      - vdbe_vdbe_untr_2_port_1
+      - network.incoming.bytes.rate
+      forwarder_vdbe_vdbe_untr_1_port_1:
+      - vdbe_vdbe_untr_1_port_1
+      - forwarder
       instance_vdbe:
       - vdbe
       - instance
       cpu.delta_vdbe:
       - vdbe
       - cpu.delta
-      network.outgoing.packets.rate_vdbe_vdbe_untr_2_port:
-      - vdbe_vdbe_untr_2_port
-      - network.outgoing.packets.rate
-      binding_vdbe_vdbe_untr_1_port:
-      - vdbe_vdbe_untr_1_port
-      - binding
+      forwarder_vdbe_vdbe_untr_2_port_1:
+      - vdbe_vdbe_untr_2_port_1
+      - forwarder
       disk.device.read.bytes.rate_vdbe:
       - vdbe
       - disk.device.read.bytes.rate
@@ -544,33 +544,36 @@ topology_template:
       memory.resident_vdbe:
       - vdbe
       - memory.resident
-      forwarder_vdbe_vdbe_untr_1_port:
-      - vdbe_vdbe_untr_1_port
-      - forwarder
       disk.write.requests.rate_vdbe:
       - vdbe
       - disk.write.requests.rate
+      feature_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_1_port_1_vlan1:
+      - vdbe_vdbe_untr_1_port_1_vlan1
+      - feature_vdbe_untr_x_vlan1-Network-Role_vmi_subport
       cpu_vdbe:
       - vdbe
       - cpu
       disk.write.bytes_vdbe:
       - vdbe
       - disk.write.bytes
-      forwarder_vdbe_vdbe_untr_2_port:
-      - vdbe_vdbe_untr_2_port
-      - forwarder
       disk.device.usage_vdbe:
       - vdbe
       - disk.device.usage
       disk.device.read.bytes_vdbe:
       - vdbe
       - disk.device.read.bytes
+      feature_vdbe_vdbe_untr_2_port_1:
+      - vdbe_vdbe_untr_2_port_1
+      - feature
       disk.latency_vdbe:
       - vdbe
       - disk.latency
-      network.outgoing.packets.rate_vdbe_vdbe_untr_1_port:
-      - vdbe_vdbe_untr_1_port
-      - network.outgoing.packets.rate
+      network.incoming.bytes_vdbe_vdbe_untr_2_port_1:
+      - vdbe_vdbe_untr_2_port_1
+      - network.incoming.bytes
+      network.outgoing.bytes.rate_vdbe_vdbe_untr_1_port_1:
+      - vdbe_vdbe_untr_1_port_1
+      - network.outgoing.bytes.rate
       disk.capacity_vdbe:
       - vdbe
       - disk.capacity
@@ -580,36 +583,39 @@ topology_template:
       disk.allocation_vdbe:
       - vdbe
       - disk.allocation
-      network.outpoing.packets_vdbe_vdbe_untr_1_port:
-      - vdbe_vdbe_untr_1_port
-      - network.outpoing.packets
-      network.incoming.packets_vdbe_vdbe_untr_1_port:
-      - vdbe_vdbe_untr_1_port
-      - network.incoming.packets
+      feature_vdbe_vdbe_untr_1_port_1:
+      - vdbe_vdbe_untr_1_port_1
+      - feature
       disk.read.bytes.rate_vdbe:
       - vdbe
       - disk.read.bytes.rate
-      network.incoming.bytes_vdbe_vdbe_untr_2_port:
-      - vdbe_vdbe_untr_2_port
-      - network.incoming.bytes
+      binding_vdbe_vdbe_untr_2_port_1:
+      - vdbe_vdbe_untr_2_port_1
+      - binding
       os_vdbe:
       - vdbe
       - os
       disk.device.read.requests_vdbe:
       - vdbe
       - disk.device.read.requests
-      network.incoming.packets.rate_vdbe_vdbe_untr_2_port:
-      - vdbe_vdbe_untr_2_port
-      - network.incoming.packets.rate
+      network.outgoing.bytes_vdbe_vdbe_untr_2_port_1:
+      - vdbe_vdbe_untr_2_port_1
+      - network.outgoing.bytes
       disk.root.size_vdbe:
       - vdbe
       - disk.root.size
-      network.incoming.bytes.rate_vdbe_vdbe_untr_2_port:
-      - vdbe_vdbe_untr_2_port
+      network.incoming.packets.rate_vdbe_vdbe_untr_2_port_1:
+      - vdbe_vdbe_untr_2_port_1
+      - network.incoming.packets.rate
+      feature_vdbe_vdbe_untr_1_port_1_vlan1:
+      - vdbe_vdbe_untr_1_port_1_vlan1
+      - feature
+      network.incoming.packets_vdbe_vdbe_untr_1_port_1:
+      - vdbe_vdbe_untr_1_port_1
+      - network.incoming.packets
+      network.incoming.bytes.rate_vdbe_vdbe_untr_1_port_1:
+      - vdbe_vdbe_untr_1_port_1
       - network.incoming.bytes.rate
-      binding_vdbe_vdbe_untr_2_port:
-      - vdbe_vdbe_untr_2_port
-      - binding
       memory_vdbe:
       - vdbe
       - memory
@@ -619,12 +625,6 @@ topology_template:
       disk.device.write.bytes_vdbe:
       - vdbe
       - disk.device.write.bytes
-      network.outgoing.bytes_vdbe_vdbe_untr_2_port:
-      - vdbe_vdbe_untr_2_port
-      - network.outgoing.bytes
-      network.outgoing.bytes.rate_vdbe_vdbe_untr_1_port:
-      - vdbe_vdbe_untr_1_port
-      - network.outgoing.bytes.rate
       disk.device.read.requests.rate_vdbe:
       - vdbe
       - disk.device.read.requests.rate
@@ -632,30 +632,30 @@ topology_template:
       - vdbe
       - disk.read.bytes
     requirements:
-      dependency_vdbe_vdbe_untr_1_port:
-      - vdbe_vdbe_untr_1_port
+      dependency_vdbe_vdbe_untr_1_port_1:
+      - vdbe_vdbe_untr_1_port_1
+      - dependency
+      dependency_vdbe_vdbe_untr_2_port_1:
+      - vdbe_vdbe_untr_2_port_1
+      - dependency
+      dependency_vdbe_vdbe_untr_1_port_1_vlan1:
+      - vdbe_vdbe_untr_1_port_1_vlan1
       - dependency
-      link_vdbe_vdbe_untr_2_port:
-      - vdbe_vdbe_untr_2_port
-      - link
       local_storage_vdbe:
       - vdbe
       - local_storage
-      dependency_vdbe_vdbe_untr_2_port:
-      - vdbe_vdbe_untr_2_port
-      - dependency
-      dependency_vdbe_vdbe_untr_1_port_vlan1:
-      - vdbe_vdbe_untr_1_port_vlan1
-      - dependency
-      dependency_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_1_port_vlan1:
-      - vdbe_vdbe_untr_1_port_vlan1
+      link_vdbe_vdbe_untr_2_port_1:
+      - vdbe_vdbe_untr_2_port_1
+      - link
+      subinterface_link_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_1_port_1_vlan1:
+      - vdbe_vdbe_untr_1_port_1_vlan1
+      - subinterface_link_vdbe_untr_x_vlan1-Network-Role_vmi_subport
+      dependency_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_1_port_1_vlan1:
+      - vdbe_vdbe_untr_1_port_1_vlan1
       - dependency_vdbe_untr_x_vlan1-Network-Role_vmi_subport
-      link_vdbe_vdbe_untr_1_port:
-      - vdbe_vdbe_untr_1_port
+      link_vdbe_vdbe_untr_1_port_1:
+      - vdbe_vdbe_untr_1_port_1
       - link
       dependency_vdbe:
       - vdbe
       - dependency
-      subinterface_link_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_1_port_vlan1:
-      - vdbe_vdbe_untr_1_port_vlan1
-      - subinterface_link_vdbe_untr_x_vlan1-Network-Role_vmi_subport
\ No newline at end of file