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, 224 insertions, 224 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/complexVFCMultiLevelNestedDiffComputeScenario/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/complexVFCMultiLevelNestedDiffComputeScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml
index de35f9126e..0aaf991239 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/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/complexVFCMultiLevelNestedDiffComputeScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -918,6 +918,14 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: float
+      port_pd_server_1b_port_0_subnetpoolid:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_pd_server_1b_port_0_exCP_naming:
+        type: org.openecomp.datatypes.Naming
+        required: true
+        status: SUPPORTED
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
@@ -926,108 +934,100 @@ node_types:
         status: SUPPORTED
         constraints:
         - greater_or_equal: 0
+      port_pd_server_1b_port_0_ip_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.IpRequirements
+      port_pd_server_1b_port_0_network_role_tag:
+        type: string
+        required: true
+        status: SUPPORTED
       vm_flavor_name:
         type: string
         required: true
         status: SUPPORTED
-      port_pd_server_1b_port_vlan_requirements:
+      port_pd_server_1b_port_0_order:
+        type: integer
+        required: true
+        status: SUPPORTED
+      port_pd_server_1b_port_0_network:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
+          type: string
       subinterface_nested_vlan_net1:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_pd_server_1b_port_related_networks:
+      port_pd_server_1b_port_0_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
-      port_pd_server_1b_port_network_role_tag:
-        type: string
-        required: true
-        status: SUPPORTED
+          type: org.openecomp.datatypes.network.VlanRequirements
       vm_image_name:
         type: string
         required: true
         status: SUPPORTED
-      port_pd_server_1b_port_replacement_policy:
+      port_pd_server_1b_port_0_related_networks:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
-      port_pd_server_1b_port_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
-        required: true
-        status: SUPPORTED
-      port_pd_server_1b_port_network_role:
-        type: string
-        required: true
-        status: SUPPORTED
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       subinterface_nested_vlan_parent_interface:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_pd_server_1b_port_fixed_ips:
+      port_pd_server_1b_port_0_replacement_policy:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.heat.neutron.port.FixedIps
-      port_pd_server_1b_port_network:
-        type: list
+          type: string
+      port_pd_server_1b_port_0_network_role:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_pd_server_1b_port_0_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       compute_pd_server_1b_availability_zone:
         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:
+      port_pd_server_1b_port_0_fixed_ips:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
-      port_pd_server_1b_port_subnetpoolid:
-        type: string
-        required: true
-        status: SUPPORTED
+          type: org.openecomp.datatypes.heat.neutron.port.FixedIps
     requirements:
-    - dependency_pd_server_1b_pd_server_1b_port_nested_vlan:
+    - dependency_pd_server_1b_pd_server_1b_port_0_nested_vlan:
         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:
+    - dependency_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_0_nested_vlan:
         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:
+    - subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_0_nested_vlan:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
@@ -1047,14 +1047,14 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_pd_server_1b_pd_server_1b_port:
+    - dependency_pd_server_1b_pd_server_1b_port_0:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_pd_server_1b_pd_server_1b_port:
+    - link_pd_server_1b_pd_server_1b_port_0:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
@@ -1067,11 +1067,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:
@@ -1091,34 +1086,31 @@ 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:
+      disk.device.read.requests_pd_server_1b:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      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:
+      network.incoming.packets.rate_pd_server_1b_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.device.read.requests_pd_server_1b:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      binding_pd_server_1b_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
         occurrences:
-        - 1
+        - 0
         - UNBOUNDED
       feature_pd_server_1b:
         type: tosca.capabilities.Node
@@ -1131,14 +1123,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.
@@ -1174,7 +1158,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_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:
@@ -1204,14 +1188,15 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.usage_pd_server_1b:
+      network.incoming.bytes.rate_pd_server_1b_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
-      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
@@ -1227,13 +1212,23 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      feature_pd_server_1b_pd_server_1b_port_0_nested_vlan:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.ephemeral.size_pd_server_1b:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port:
+      forwarder_pd_server_1b_pd_server_1b_port_0:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.outgoing.bytes_pd_server_1b_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:
@@ -1250,18 +1245,19 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      feature_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan:
-        type: tosca.capabilities.Node
+      disk.device.write.bytes.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.device.write.bytes.rate_pd_server_1b:
+      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.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.root.size_pd_server_1b:
+      network.outgoing.bytes.rate_pd_server_1b_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:
@@ -1273,6 +1269,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      feature_pd_server_1b_pd_server_1b_port_0:
+        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.
@@ -1296,15 +1297,14 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_pd_server_1b_pd_server_1b_port:
+      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.
         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.
+      feature_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_0_nested_vlan:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
@@ -1319,24 +1319,24 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_pd_server_1b_pd_server_1b_port:
+      network.outpoing.packets_pd_server_1b_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_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.
+      attachment_pd_server_1b_pd_server_1b_port_0:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      feature_pd_server_1b_pd_server_1b_port_nested_vlan:
-        type: tosca.capabilities.Node
+      memory.resident_pd_server_1b:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_pd_server_1b_pd_server_1b_port:
+      network.incoming.packets_pd_server_1b_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:
@@ -1360,19 +1360,19 @@ 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:
+      network.outgoing.packets.rate_pd_server_1b_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:
@@ -1966,4 +1966,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/complexVFCMultiLevelNestedDiffComputeScenario/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/complexVFCMultiLevelNestedDiffComputeScenario/out/Nested_pd_server_1bServiceTemplate.yaml
index 17f0ff073f..92de2147d9 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/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/complexVFCMultiLevelNestedDiffComputeScenario/out/Nested_pd_server_1bServiceTemplate.yaml
@@ -21,6 +21,12 @@ topology_template:
       required: true
       entry_schema:
         type: float
+    port_pd_server_1b_port_0_subnetpoolid:
+      type: string
+      required: true
+    port_pd_server_1b_port_0_exCP_naming:
+      type: org.openecomp.datatypes.Naming
+      required: true
     index_value:
       type: integer
       description: Index value of this substitution service template runtime instance
@@ -28,77 +34,71 @@ topology_template:
       default: 0
       constraints:
       - greater_or_equal: 0
+    port_pd_server_1b_port_0_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.IpRequirements
+    port_pd_server_1b_port_0_network_role_tag:
+      type: string
+      required: true
     vm_flavor_name:
       type: string
       required: true
-    port_pd_server_1b_port_vlan_requirements:
+    port_pd_server_1b_port_0_order:
+      type: integer
+      required: true
+    port_pd_server_1b_port_0_network:
       type: list
       required: true
       entry_schema:
-        type: org.openecomp.datatypes.network.VlanRequirements
+        type: string
     subinterface_nested_vlan_net1:
       type: list
       required: true
       entry_schema:
         type: string
-    port_pd_server_1b_port_related_networks:
+    port_pd_server_1b_port_0_vlan_requirements:
       type: list
       required: true
       entry_schema:
-        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
-    port_pd_server_1b_port_network_role_tag:
-      type: string
-      required: true
+        type: org.openecomp.datatypes.network.VlanRequirements
     vm_image_name:
       type: string
       required: true
-    port_pd_server_1b_port_replacement_policy:
+    port_pd_server_1b_port_0_related_networks:
       type: list
       required: true
       entry_schema:
-        type: string
-    port_pd_server_1b_port_mac_requirements:
-      type: org.openecomp.datatypes.network.MacRequirements
-      required: true
-    port_pd_server_1b_port_network_role:
-      type: string
-      required: true
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     subinterface_nested_vlan_parent_interface:
       type: list
       required: true
       entry_schema:
         type: string
-    port_pd_server_1b_port_fixed_ips:
-      type: list
-      required: true
-      entry_schema:
-        type: org.openecomp.datatypes.heat.neutron.port.FixedIps
-    port_pd_server_1b_port_network:
+    port_pd_server_1b_port_0_replacement_policy:
       type: list
       required: true
       entry_schema:
         type: string
+    port_pd_server_1b_port_0_network_role:
+      type: string
+      required: true
+    port_pd_server_1b_port_0_mac_requirements:
+      type: org.openecomp.datatypes.network.MacRequirements
+      required: true
     compute_pd_server_1b_availability_zone:
       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:
+    port_pd_server_1b_port_0_fixed_ips:
       type: list
       required: true
       entry_schema:
-        type: org.openecomp.datatypes.network.IpRequirements
-    port_pd_server_1b_port_subnetpoolid:
-      type: string
-      required: true
+        type: org.openecomp.datatypes.heat.neutron.port.FixedIps
   node_templates:
-    pd_server_1b_pd_server_1b_port_nested_vlan:
+    pd_server_1b_pd_server_1b_port_0_nested_vlan:
       type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested_vlan
       directives:
       - substitutable
@@ -121,7 +121,7 @@ topology_template:
       requirements:
       - binding_template_Vlan_vmi_1:
           capability: tosca.capabilities.network.Bindable
-          node: pd_server_1b_pd_server_1b_port
+          node: pd_server_1b_pd_server_1b_port_0
           relationship: tosca.relationships.network.BindsTo
     pd_server_1b:
       type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server_1b
@@ -138,39 +138,39 @@ 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_0:
       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_0_replacement_policy
           - index_value
         mac_requirements:
-          get_input: port_pd_server_1b_port_mac_requirements
+          get_input: port_pd_server_1b_port_0_mac_requirements
         order:
-          get_input: port_pd_server_1b_port_order
+          get_input: port_pd_server_1b_port_0_order
         exCP_naming:
-          get_input: port_pd_server_1b_port_exCP_naming
+          get_input: port_pd_server_1b_port_0_exCP_naming
         vlan_requirements:
-          get_input: port_pd_server_1b_port_vlan_requirements
+          get_input: port_pd_server_1b_port_0_vlan_requirements
         subinterface_indicator: true
         ip_requirements:
-          get_input: port_pd_server_1b_port_ip_requirements
+          get_input: port_pd_server_1b_port_0_ip_requirements
         related_networks:
-          get_input: port_pd_server_1b_port_related_networks
+          get_input: port_pd_server_1b_port_0_related_networks
         network_role_tag:
-          get_input: port_pd_server_1b_port_network_role_tag
+          get_input: port_pd_server_1b_port_0_network_role_tag
         network_role:
-          get_input: port_pd_server_1b_port_network_role
+          get_input: port_pd_server_1b_port_0_network_role
         fixed_ips:
           get_input:
-          - port_pd_server_1b_port_fixed_ips
+          - port_pd_server_1b_port_0_fixed_ips
           - index_value
         subnetpoolid:
-          get_input: port_pd_server_1b_port_subnetpoolid
+          get_input: port_pd_server_1b_port_0_subnetpoolid
         network:
           get_input:
-          - port_pd_server_1b_port_network
+          - port_pd_server_1b_port_0_network
           - index_value
       requirements:
       - binding:
@@ -183,9 +183,6 @@ topology_template:
       disk.device.read.bytes_pd_server_1b:
       - pd_server_1b
       - disk.device.read.bytes
-      feature_pd_server_1b_pd_server_1b_port:
-      - pd_server_1b_pd_server_1b_port
-      - feature
       host_pd_server_1b:
       - pd_server_1b
       - host
@@ -195,30 +192,24 @@ 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
       disk.device.read.requests_pd_server_1b:
       - pd_server_1b
       - disk.device.read.requests
+      network.incoming.packets.rate_pd_server_1b_pd_server_1b_port_0:
+      - pd_server_1b_pd_server_1b_port_0
+      - network.incoming.packets.rate
+      binding_pd_server_1b_pd_server_1b_port_0:
+      - pd_server_1b_pd_server_1b_port_0
+      - binding
       feature_pd_server_1b:
       - pd_server_1b
       - feature
       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
@@ -237,9 +228,9 @@ topology_template:
       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_0:
+      - pd_server_1b_pd_server_1b_port_0
+      - network.incoming.bytes
       memory_pd_server_1b:
       - pd_server_1b
       - memory
@@ -252,42 +243,51 @@ 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_0:
+      - pd_server_1b_pd_server_1b_port_0
+      - 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
       disk.latency_pd_server_1b:
       - pd_server_1b
       - disk.latency
+      feature_pd_server_1b_pd_server_1b_port_0_nested_vlan:
+      - pd_server_1b_pd_server_1b_port_0_nested_vlan
+      - feature
       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
+      forwarder_pd_server_1b_pd_server_1b_port_0:
+      - pd_server_1b_pd_server_1b_port_0
+      - forwarder
+      network.outgoing.bytes_pd_server_1b_pd_server_1b_port_0:
+      - pd_server_1b_pd_server_1b_port_0
+      - 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
       disk.device.write.bytes.rate_pd_server_1b:
       - pd_server_1b
       - disk.device.write.bytes.rate
       disk.root.size_pd_server_1b:
       - pd_server_1b
       - disk.root.size
+      network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port_0:
+      - pd_server_1b_pd_server_1b_port_0
+      - network.outgoing.bytes.rate
       disk.iops_pd_server_1b:
       - pd_server_1b
       - disk.iops
+      feature_pd_server_1b_pd_server_1b_port_0:
+      - pd_server_1b_pd_server_1b_port_0
+      - feature
       disk.write.bytes_pd_server_1b:
       - pd_server_1b
       - disk.write.bytes
@@ -300,29 +300,29 @@ 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
+      feature_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_0_nested_vlan:
+      - pd_server_1b_pd_server_1b_port_0_nested_vlan
+      - feature_template_Vlan_vmi_1
       binding_pd_server_1b:
       - pd_server_1b
       - binding
       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
+      network.outpoing.packets_pd_server_1b_pd_server_1b_port_0:
+      - pd_server_1b_pd_server_1b_port_0
+      - network.outpoing.packets
+      attachment_pd_server_1b_pd_server_1b_port_0:
+      - pd_server_1b_pd_server_1b_port_0
+      - 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_0:
+      - pd_server_1b_pd_server_1b_port_0
       - network.incoming.packets
       disk.device.write.requests.rate_pd_server_1b:
       - pd_server_1b
@@ -333,15 +333,15 @@ 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
       disk.usage_pd_server_1b:
       - pd_server_1b
       - disk.usage
+      network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port_0:
+      - pd_server_1b_pd_server_1b_port_0
+      - network.outgoing.packets.rate
       disk.write.requests.rate_pd_server_1b:
       - pd_server_1b
       - disk.write.requests.rate
@@ -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
-      dependency_pd_server_1b_pd_server_1b_port_nested_vlan:
-      - pd_server_1b_pd_server_1b_port_nested_vlan
+      subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_0_nested_vlan:
+      - pd_server_1b_pd_server_1b_port_0_nested_vlan
+      - subinterface_link_template_Vlan_vmi_1
+      dependency_pd_server_1b_pd_server_1b_port_0_nested_vlan:
+      - pd_server_1b_pd_server_1b_port_0_nested_vlan
+      - dependency
+      dependency_pd_server_1b_pd_server_1b_port_0:
+      - pd_server_1b_pd_server_1b_port_0
       - dependency
-      dependency_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan:
-      - pd_server_1b_pd_server_1b_port_nested_vlan
+      link_pd_server_1b_pd_server_1b_port_0:
+      - pd_server_1b_pd_server_1b_port_0
+      - link
+      dependency_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_0_nested_vlan:
+      - pd_server_1b_pd_server_1b_port_0_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
-      - 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/complexVFCMultiLevelNestedDiffComputeScenario/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/complexVFCMultiLevelNestedDiffComputeScenario/out/nested_pattern5ServiceTemplate.yaml
index 033465e290..35faea70fa 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/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/complexVFCMultiLevelNestedDiffComputeScenario/out/nested_pattern5ServiceTemplate.yaml
@@ -104,34 +104,34 @@ topology_template:
           - 0
         subinterface_nested_vlan_service_template_filter_count:
         - 9
+        port_pd_server_1b_port_0_ip_requirements:
+        - ip_version: 4
+          ip_count_required:
+            is_required: true
+          floating_ip_count_required:
+            is_required: false
         vm_flavor_name:
           get_input: pd_server_1b_flavor
+        port_pd_server_1b_port_0_network:
+        - packet_internal_network
         subinterface_nested_vlan_net1:
         - packet_external_network
         vm_image_name:
           get_input: pd_server_1b_image
-        port_pd_server_1b_port_replacement_policy:
+        subinterface_nested_vlan_parent_interface:
+        - pd_server_1b_port_0
+        port_pd_server_1b_port_0_replacement_policy:
         - AUTO
-        port_pd_server_1b_port_mac_requirements:
+        port_pd_server_1b_port_0_mac_requirements:
           mac_count_required:
             is_required: false
-        subinterface_nested_vlan_parent_interface:
-        - pd_server_1b_port_0
-        port_pd_server_1b_port_fixed_ips:
+        compute_pd_server_1b_availability_zone:
+        - get_input: availability_zone_0
+        port_pd_server_1b_port_0_fixed_ips:
         - ip_address:
             get_input:
             - pd_server_1b_ips
             - 0
-        port_pd_server_1b_port_network:
-        - packet_internal_network
-        compute_pd_server_1b_availability_zone:
-        - get_input: availability_zone_0
-        port_pd_server_1b_port_ip_requirements:
-        - ip_version: 4
-          ip_count_required:
-            is_required: true
-          floating_ip_count_required:
-            is_required: false
         service_template_filter:
           substitute_service_template: Nested_pd_server_1bServiceTemplate.yaml
           count: 1
@@ -141,11 +141,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_0:
           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_0_nested_vlan:
           capability: tosca.capabilities.network.Linkable
           node: packet_external_network
           relationship: tosca.relationships.network.LinksTo
@@ -186,19 +186,19 @@ topology_template:
       - forwarder_ps_server_1b_port_1
       forwarder_pd_server_1b_port_0:
       - abstract_pd_server_1b
-      - forwarder_pd_server_1b_pd_server_1b_port
+      - forwarder_pd_server_1b_pd_server_1b_port_0
       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_pd_server_1b_port_0
       network.incoming.packets_ps_server_1b_port_1_test_nested_level2:
       - test_nested_level2
       - network.incoming.packets_ps_server_1b_port_1
       feature_pd_server_1b_port_0:
       - abstract_pd_server_1b
-      - feature_pd_server_1b_pd_server_1b_port
+      - feature_pd_server_1b_pd_server_1b_port_0
       memory_server_1b_ps_1_test_nested_level2:
       - test_nested_level2
       - memory_server_1b_ps_1
@@ -324,7 +324,7 @@ topology_template:
       - feature_template_Vlan_vmi_1_test_resourceGroup_1
       network.outgoing.bytes_pd_server_1b_port_0:
       - abstract_pd_server_1b
-      - network.outgoing.bytes_pd_server_1b_pd_server_1b_port
+      - network.outgoing.bytes_pd_server_1b_pd_server_1b_port_0
       disk.read.requests_server_1b_ps_1_test_nested_level2:
       - test_nested_level2
       - disk.read.requests_server_1b_ps_1
@@ -342,7 +342,7 @@ topology_template:
       - memory.resident_pd_server_1b
       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_0
       disk.device.read.bytes_server_1b_pd_0:
       - abstract_pd_server_1b
       - disk.device.read.bytes_pd_server_1b
@@ -351,7 +351,7 @@ topology_template:
       - feature_server_1b_ps_1
       attachment_pd_server_1b_port_0:
       - abstract_pd_server_1b
-      - attachment_pd_server_1b_pd_server_1b_port
+      - attachment_pd_server_1b_pd_server_1b_port_0
       attachment_packet_ext_network_test_nested_level2:
       - test_nested_level2
       - attachment_packet_ext_network
@@ -414,10 +414,10 @@ topology_template:
       - disk.device.read.requests_server_1b_ps_1
       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.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port_0
       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.incoming.packets.rate_pd_server_1b_pd_server_1b_port_0
       os_server_1b_pd_0:
       - abstract_pd_server_1b
       - os_pd_server_1b
@@ -450,7 +450,7 @@ topology_template:
       - attachment_packet_int_network
       network.incoming.bytes_pd_server_1b_port_0:
       - abstract_pd_server_1b
-      - network.incoming.bytes_pd_server_1b_pd_server_1b_port
+      - network.incoming.bytes_pd_server_1b_pd_server_1b_port_0
       disk.root.size_server_1b_pd_0:
       - abstract_pd_server_1b
       - disk.root.size_pd_server_1b
@@ -489,7 +489,7 @@ topology_template:
       - link_packet_ext_network
       binding_pd_server_1b_port_0:
       - abstract_pd_server_1b
-      - binding_pd_server_1b_pd_server_1b_port
+      - binding_pd_server_1b_pd_server_1b_port_0
       disk.device.read.requests.rate_server_1b_pd_0:
       - abstract_pd_server_1b
       - disk.device.read.requests.rate_pd_server_1b
@@ -522,7 +522,7 @@ topology_template:
       - disk.device.read.requests_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
+      - network.incoming.packets_pd_server_1b_pd_server_1b_port_0
       disk.read.bytes.rate_server_1b_pd_0:
       - abstract_pd_server_1b
       - disk.read.bytes.rate_pd_server_1b
@@ -540,7 +540,7 @@ topology_template:
       - 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
+      - network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port_0
       disk.write.requests.rate_server_1b_ps_1_test_nested_level2:
       - test_nested_level2
       - disk.write.requests.rate_server_1b_ps_1
@@ -553,7 +553,7 @@ topology_template:
       - dependency_ps_server_1b_port_1
       dependency_pd_server_1b_port_0:
       - abstract_pd_server_1b
-      - dependency_pd_server_1b_pd_server_1b_port
+      - dependency_pd_server_1b_pd_server_1b_port_0
       dependency_template_Vlan_vmi_1_test_resourceGroup_0:
       - test_resourceGroup_0
       - dependency_template_Vlan_vmi_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/complexVFCMultiLevelNestedDiffComputeScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml
index a27844365a..0e7a681e1b 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml
@@ -409,4 +409,4 @@ topology_template:
       - dependency_template_Vlan_vmi_1
       dependency_server_1b_ps_1:
       - server_1b_ps_1
-      - dependency
\ No newline at end of file
+      - dependency