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>

22 files changed, 2771 insertions, 2771 deletions

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/in/base_vIECCF.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/in/base_vIECCF.yml
index 6025cd8344..d6794e1dd2 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/in/base_vIECCF.yml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/in/base_vIECCF.yml
@@ -280,13 +280,13 @@ resources:
             networks:
                 -
                     port:
-                        get_resource: plt_internal_0_port_0
+                        get_resource: plt_0_internal_port_0
                 -
                     port:
-                        get_resource: plt_oam_0_port_0
+                        get_resource: plt_0_oam_port_0
                 -
                     port:
-                        get_resource: plt_data_0_port_0
+                        get_resource: plt_0_data_port_0
             user_data_format: RAW
             user_data:
                 str_replace:
@@ -340,20 +340,20 @@ resources:
             networks:
                 -
                     get_attr:
-                        - plt_internal_0_port_0
+                        - plt_0_internal_port_0
                         - network_id
                 -
                     get_attr:
-                        - plt_oam_0_port_0
+                        - plt_0_oam_port_0
                         - network_id
                 -
                     get_attr:
-                        - plt_data_0_port_0
+                        - plt_0_data_port_0
                         - network_id
             mcas_mate_id: m002
             pair_uuid: {get_param: plt_pair_uuid}
             shared_vol1: {get_param: plt_volume_shared_id_0}
-    plt_internal_0_port_0:
+    plt_0_internal_port_0:
         type: OS::Neutron::Port
         properties:
             name:
@@ -372,7 +372,7 @@ resources:
         metadata:
             os_net: {get_resource: internal_net_0 }
 
-    plt_internal_0_port_1:
+    plt_1_internal_port_0:
         type: OS::Neutron::Port
         properties:
             name:
@@ -391,7 +391,7 @@ resources:
         metadata:
             os_net: {get_resource: internal_net_0 }
             
-    plt_oam_0_port_0:
+    plt_0_oam_port_0:
         type: OS::Neutron::Port
         properties:
             name:
@@ -421,7 +421,7 @@ resources:
             os_net: { get_param: oam_net_id }
             ext_net: oam
 
-    plt_oam_0_port_1:
+    plt_1_oam_port_0:
         type: OS::Neutron::Port
         properties:
             name:
@@ -448,7 +448,7 @@ resources:
             os_net: { get_param: oam_net_id }
             ext_net: oam
 
-    plt_data_0_port_0:
+    plt_0_data_port_0:
         type: OS::Neutron::Port
         properties:
             name:
@@ -478,7 +478,7 @@ resources:
             os_net: { get_param: data_net_id }
             ext_net: data
 
-    plt_data_0_port_1:
+    plt_1_data_port_0:
         type: OS::Neutron::Port
         properties:
             name:
@@ -529,13 +529,13 @@ resources:
             networks:
                 -
                     port:
-                        get_resource: plt_internal_0_port_1
+                        get_resource: plt_1_internal_port_0
                 -
                     port:
-                        get_resource: plt_oam_0_port_1
+                        get_resource: plt_1_oam_port_0
                 -
                     port:
-                        get_resource: plt_data_0_port_1
+                        get_resource: plt_1_data_port_0
             user_data_format: RAW
             user_data:
                 str_replace:
@@ -688,13 +688,13 @@ resources:
             networks:
                 -
                     port:
-                        get_resource: iox_internal_0_port_0
+                        get_resource: iox_0_internal_port_0
                 -
                     port:
-                        get_resource: iox_oam_0_port_0
+                        get_resource: iox_0_oam_port_0
                 -
                     port:
-                        get_resource: iox_data_0_port_0
+                        get_resource: iox_0_data_port_0
             user_data_format: RAW
             user_data:
                 str_replace:
@@ -744,20 +744,20 @@ resources:
             networks:
                 -
                     get_attr:
-                        - iox_internal_0_port_0
+                        - iox_0_internal_port_0
                         - network_id
                 -
                     get_attr:
-                        - iox_oam_0_port_0
+                        - iox_0_oam_port_0
                         - network_id
                 -
                     get_attr:
-                        - iox_data_0_port_0
+                        - iox_0_data_port_0
                         - network_id
             mcas_mate_id: m004
             pair_uuid: {get_param: iox_pair_uuid}
 #            shared_vol1: {get_param: iox_volume_shared_0}
-    iox_internal_0_port_0:
+    iox_0_internal_port_0:
         type: OS::Neutron::Port
         properties:
             name:
@@ -776,7 +776,7 @@ resources:
         metadata:
             os_net: {get_resource: internal_net_0 }
 
-    iox_oam_0_port_0:
+    iox_0_oam_port_0:
         type: OS::Neutron::Port
         properties:
             name:
@@ -800,7 +800,7 @@ resources:
         metadata:
             os_net: { get_param: oam_net_id }
             ext_net: io
-    iox_data_0_port_0:
+    iox_0_data_port_0:
         type: OS::Neutron::Port
         properties:
             name:
@@ -844,13 +844,13 @@ resources:
             networks:
                 -
                     port:
-                        get_resource: iox_internal_0_port_1
+                        get_resource: iox_1_internal_port_0
                 -
                     port:
-                        get_resource: iox_oam_0_port_1
+                        get_resource: iox_1_oam_port_0
                 -
                     port:
-                        get_resource: iox_data_0_port_1
+                        get_resource: iox_1_data_port_0
             user_data_format: RAW
             user_data:
                 str_replace:
@@ -913,7 +913,7 @@ resources:
             mcas_mate_id: m003
             pair_uuid: {get_param: iox_pair_uuid}
 #            shared_vol1: {get_param: iox_volume_shared_0}
-    iox_internal_0_port_1:
+    iox_1_internal_port_0:
         type: OS::Neutron::Port
         properties:
             name:
@@ -933,7 +933,7 @@ resources:
         metadata:
             os_net: {get_resource: internal_net_0 }
  
-    iox_oam_0_port_1:
+    iox_1_oam_port_0:
         type: OS::Neutron::Port
         properties:
             name:
@@ -962,7 +962,7 @@ resources:
         metadata:
             os_net: { get_param: oam_net_id }
             ext_net: io
-    iox_data_0_port_1:
+    iox_1_data_port_0:
         type: OS::Neutron::Port
         properties:
             name:
@@ -1059,13 +1059,13 @@ resources:
             networks:
                 -
                     port:
-                        get_resource: app_internal_0_port_0
+                        get_resource: app_0_internal_port_0
                 -
                     port:
-                        get_resource: app_oam_0_port_0
+                        get_resource: app_0_oam_port_0
                 -
                     port:
-                        get_resource: app_data_0_port_0
+                        get_resource: app_0_data_port_0
             user_data_format: RAW
             user_data:
                 str_replace:
@@ -1114,17 +1114,17 @@ resources:
             networks:
                 -
                     get_attr:
-                        - app_internal_0_port_0
+                        - app_0_internal_port_0
                         - network_id
                 -
                     get_attr:
-                        - app_oam_0_port_0
+                        - app_0_oam_port_0
                         - network_id
                 -
                     get_attr:
-                        - app_data_0_port_0
+                        - app_0_data_port_0
                         - network_id
-    app_internal_0_port_0:
+    app_0_internal_port_0:
         type: OS::Neutron::Port
         properties:
             name:
@@ -1143,7 +1143,7 @@ resources:
         metadata:
             os_net: {get_resource: internal_net_0 }
 
-    app_oam_0_port_0:
+    app_0_oam_port_0:
         type: OS::Neutron::Port
         properties:
             name:
@@ -1162,7 +1162,7 @@ resources:
             os_net: { get_param: oam_net_id }
             ext_net: oam    
     
-    app_data_0_port_0:
+    app_0_data_port_0:
         type: OS::Neutron::Port
         properties:
             name:
@@ -1204,13 +1204,13 @@ resources:
             networks:
                 -
                     port:
-                        get_resource: app_internal_0_port_1
+                        get_resource: app_1_internal_port_0
                 -
                     port:
-                        get_resource: app_oam_0_port_1
+                        get_resource: app_1_oam_port_0
                 -
                     port:
-                        get_resource: app_data_0_port_1
+                        get_resource: app_1_data_port_0
             user_data_format: RAW
             user_data:
                 str_replace:
@@ -1270,7 +1270,7 @@ resources:
                     get_attr:
                         - app_data_1_port_0
                         - network_id
-    app_internal_0_port_1:
+    app_1_internal_port_0:
         type: OS::Neutron::Port
         properties:
             name:
@@ -1289,7 +1289,7 @@ resources:
         metadata:
             os_net: {get_resource: internal_net_0 }
 
-    app_oam_0_port_1:
+    app_1_oam_port_0:
         type: OS::Neutron::Port
         properties:
             name:
@@ -1311,7 +1311,7 @@ resources:
             os_net: { get_param: oam_net_id }
             ext_net: oam    
 
-    app_data_0_port_1:
+    app_1_data_port_0:
         type: OS::Neutron::Port
         properties:
             name:
@@ -1353,13 +1353,13 @@ resources:
             networks:
                 -
                     port:
-                        get_resource: app_internal_0_port_2
+                        get_resource: app_2_internal_port_0
                 -
                     port:
-                        get_resource: app_oam_0_port_2
+                        get_resource: app_2_oam_port_0
                 -
                     port:
-                        get_resource: app_data_0_port_2
+                        get_resource: app_2_data_port_0
             user_data_format: RAW
             user_data:
                 str_replace:
@@ -1418,7 +1418,7 @@ resources:
                     get_attr:
                         - app_data_2_port_0
                         - network_id
-    app_internal_0_port_2:
+    app_2_internal_port_0:
         type: OS::Neutron::Port
         properties:
             name:
@@ -1437,7 +1437,7 @@ resources:
         metadata:
             os_net: {get_resource: internal_net_0 }
 
-    app_oam_0_port_2:
+    app_2_oam_port_0:
         type: OS::Neutron::Port
         properties:
             name:
@@ -1459,7 +1459,7 @@ resources:
             os_net: { get_param: oam_net_id }
             ext_net: oam    
 
-    app_data_0_port_2:
+    app_2_data_port_0:
         type: OS::Neutron::Port
         properties:
             name:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/GlobalSubstitutionTypesServiceTemplate.yaml
index c2bde7bca1..fc83a30f88 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -8,39 +8,33 @@ node_types:
   org.openecomp.resource.abstract.nodes.plt:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
-      port_plt_data_0_port_related_networks:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
-      port_plt_oam_0_port_exCP_naming:
-        type: org.openecomp.datatypes.Naming
-        required: true
-        status: SUPPORTED
-      port_plt_oam_0_port_subnetpoolid:
+      port_plt_oam_port_0_network_role_tag:
         type: string
         required: true
         status: SUPPORTED
-      port_plt_internal_0_port_allowed_address_pairs:
+      port_plt_data_port_0_allowed_address_pairs:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: org.openecomp.datatypes.heat.network.AddressPair
-      port_plt_oam_0_port_security_groups:
+      port_plt_oam_port_0_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
+          type: org.openecomp.datatypes.network.IpRequirements
+      port_plt_oam_port_0_network_role:
+        type: string
+        required: true
+        status: SUPPORTED
       compute_plt_config_drive:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: boolean
-      port_plt_data_0_port_subnetpoolid:
+      port_plt_data_port_0_network_role_tag:
         type: string
         required: true
         status: SUPPORTED
@@ -48,145 +42,153 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
-      port_plt_internal_0_port_vlan_requirements:
+      port_plt_internal_port_0_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
-      port_plt_data_0_port_fixed_ips:
+      port_plt_data_port_0_network_role:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_plt_internal_port_0_replacement_policy:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.heat.neutron.port.FixedIps
+          type: string
+      port_plt_data_port_0_security_groups:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       vm_image_name:
         type: string
         required: true
         status: SUPPORTED
-      compute_plt_availability_zone:
+      port_plt_oam_port_0_name:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_plt_oam_0_port_name:
+      compute_plt_availability_zone:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_plt_internal_0_port_security_groups:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: json
-      port_plt_internal_0_port_network_role_tag:
+      port_plt_internal_port_0_network_role:
         type: string
         required: true
         status: SUPPORTED
-      port_plt_oam_0_port_ip_requirements:
+      port_plt_data_port_0_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
-      port_plt_data_0_port_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
-        required: true
-        status: SUPPORTED
-      port_plt_data_0_port_allowed_address_pairs:
+      port_plt_data_port_0_replacement_policy:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.heat.network.AddressPair
-      port_plt_internal_0_port_subnetpoolid:
+          type: string
+      port_plt_internal_port_0_subnetpoolid:
         type: string
         required: true
         status: SUPPORTED
-      port_plt_data_0_port_ip_requirements:
+      port_plt_data_port_0_order:
+        type: integer
+        required: true
+        status: SUPPORTED
+      port_plt_oam_port_0_security_groups:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
-      port_plt_internal_0_port_network:
+          type: json
+      port_plt_oam_port_0_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
+        required: true
+        status: SUPPORTED
+      port_plt_internal_port_0_allowed_address_pairs:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
-      compute_plt_metadata:
+          type: org.openecomp.datatypes.heat.network.AddressPair
+      port_plt_internal_port_0_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
-      port_plt_data_0_port_security_groups:
+          type: org.openecomp.datatypes.network.IpRequirements
+      compute_plt_metadata:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: json
-      port_plt_oam_0_port_related_networks:
+      port_plt_internal_port_0_related_networks:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
-      port_plt_internal_0_port_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
+      port_plt_oam_port_0_fixed_ips:
+        type: list
         required: true
         status: SUPPORTED
-      port_plt_data_0_port_order:
-        type: integer
+        entry_schema:
+          type: org.openecomp.datatypes.heat.neutron.port.FixedIps
+      port_plt_internal_port_0_security_groups:
+        type: list
         required: true
         status: SUPPORTED
-      port_plt_data_0_port_vlan_requirements:
+        entry_schema:
+          type: json
+      port_plt_data_port_0_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
-      port_plt_data_0_port_network_role_tag:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_plt_internal_0_port_order:
-        type: integer
-        required: true
-        status: SUPPORTED
-      port_plt_internal_0_port_ip_requirements:
+      port_plt_oam_port_0_network:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
-      port_plt_oam_0_port_fixed_ips:
+          type: string
+      port_plt_oam_port_0_replacement_policy:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.heat.neutron.port.FixedIps
-      port_plt_oam_0_port_network_role_tag:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_plt_internal_0_port_name:
+          type: string
+      port_plt_oam_port_0_related_networks:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
-      port_plt_internal_0_port_related_networks:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+      port_plt_data_port_0_related_networks:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: org.openecomp.datatypes.network.RelatedNetworksAssignments
-      port_plt_oam_0_port_order:
+      port_plt_internal_port_0_order:
+        type: integer
+        required: true
+        status: SUPPORTED
+      port_plt_internal_port_0_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
+        required: true
+        status: SUPPORTED
+      port_plt_oam_port_0_order:
         type: integer
         required: true
         status: SUPPORTED
@@ -196,56 +198,40 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      port_plt_oam_0_port_network_role:
+      port_plt_oam_port_0_subnetpoolid:
         type: string
         required: true
         status: SUPPORTED
-      port_plt_oam_0_port_allowed_address_pairs:
-        type: list
+      port_plt_internal_port_0_network_role_tag:
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.heat.network.AddressPair
-      port_plt_data_0_port_name:
-        type: list
+      port_plt_data_port_0_subnetpoolid:
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
-      port_plt_data_0_port_exCP_naming:
+      port_plt_data_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
-      port_plt_internal_0_port_network_role:
-        type: string
-        required: true
-        status: SUPPORTED
       compute_plt_user_data_format:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_plt_internal_0_port_replacement_policy:
+      port_plt_internal_port_0_network:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_plt_data_0_port_network:
+      port_plt_data_port_0_fixed_ips:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
-      port_plt_data_0_port_network_role:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_plt_internal_0_port_exCP_naming:
-        type: org.openecomp.datatypes.Naming
-        required: true
-        status: SUPPORTED
+          type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
@@ -254,62 +240,76 @@ node_types:
         status: SUPPORTED
         constraints:
         - greater_or_equal: 0
-      port_plt_oam_0_port_network:
+      port_plt_data_port_0_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
+        required: true
+        status: SUPPORTED
+      port_plt_internal_port_0_name:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_plt_oam_0_port_replacement_policy:
+      port_plt_oam_port_0_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
-      port_plt_data_0_port_replacement_policy:
+          type: org.openecomp.datatypes.network.VlanRequirements
+      compute_plt_name:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_plt_oam_0_port_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
+      port_plt_internal_port_0_exCP_naming:
+        type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
-      compute_plt_name:
+      port_plt_data_port_0_name:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_plt_oam_0_port_vlan_requirements:
+      port_plt_data_port_0_network:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
+          type: string
+      port_plt_oam_port_0_exCP_naming:
+        type: org.openecomp.datatypes.Naming
+        required: true
+        status: SUPPORTED
+      port_plt_oam_port_0_allowed_address_pairs:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.heat.network.AddressPair
     requirements:
-    - dependency_plt_plt_internal_0_port:
+    - dependency_plt_plt_data_port_0:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_plt_plt_internal_0_port:
+    - link_plt_plt_data_port_0:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
         - 1
         - 1
-    - dependency_plt_plt_data_0_port:
+    - dependency_plt_plt_oam_port_0:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_plt_plt_data_0_port:
+    - link_plt_plt_oam_port_0:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
@@ -329,21 +329,32 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_plt_plt_oam_0_port:
+    - dependency_plt_plt_internal_port_0:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_plt_plt_oam_0_port:
+    - link_plt_plt_internal_port_0:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
         - 1
         - 1
     capabilities:
-      network.outgoing.bytes.rate_plt_plt_oam_0_port:
+      network.incoming.packets_plt_plt_oam_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_plt_plt_internal_port_0:
+        type: tosca.capabilities.Attachment
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.incoming.bytes.rate_plt_plt_internal_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:
@@ -355,6 +366,14 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      binding_plt_plt_data_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:
+        - 0
+        - UNBOUNDED
       disk.iops_plt:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -367,6 +386,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      network.incoming.bytes.rate_plt_plt_data_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.allocation_plt:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -379,13 +404,13 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes_plt:
+      network.outgoing.packets.rate_plt_plt_internal_port_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_plt_plt_internal_0_port:
+      disk.read.bytes_plt:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -403,118 +428,120 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes.rate_plt:
+      network.outpoing.packets_plt_plt_oam_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
-      endpoint_plt:
-        type: tosca.capabilities.Endpoint.Admin
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.read.requests_plt:
+      network.outgoing.bytes.rate_plt_plt_internal_port_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_plt_plt_oam_0_port:
+      network.outgoing.packets.rate_plt_plt_oam_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.write.requests.rate_plt:
+      network.outgoing.bytes_plt_plt_internal_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_plt_plt_data_0_port:
-        type: tosca.capabilities.Attachment
+      disk.device.read.bytes.rate_plt:
+        type: org.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_plt:
-        type: tosca.capabilities.Node
+      network.incoming.bytes.rate_plt_plt_oam_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
-      cpu_plt:
+      network.incoming.bytes_plt_plt_internal_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.write.requests_plt:
+      network.incoming.bytes_plt_plt_oam_port_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_plt_plt_internal_0_port:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      endpoint_plt:
+        type: tosca.capabilities.Endpoint.Admin
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes_plt:
+      disk.read.requests_plt:
         type: org.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_plt_plt_oam_0_port:
+      disk.device.write.requests.rate_plt:
         type: org.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_plt_plt_internal_0_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_plt:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_plt_plt_internal_0_port:
+      cpu_plt:
         type: org.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_plt_plt_oam_0_port:
+      network.incoming.packets_plt_plt_data_port_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_plt_plt_oam_0_port:
+      disk.write.requests_plt:
         type: org.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_plt_plt_data_0_port:
+      disk.device.write.bytes_plt:
         type: org.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_plt_plt_internal_0_port:
-        type: tosca.capabilities.Attachment
+      feature_plt_plt_internal_port_0:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      binding_plt:
+      binding_plt_plt_oam_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:
+        - 0
+        - UNBOUNDED
+      feature_plt_plt_oam_port_0:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_plt_plt_oam_0_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_plt:
+        type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
         - UNBOUNDED
@@ -530,19 +557,17 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_plt_plt_data_0_port:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      forwarder_plt_plt_oam_port_0:
+        type: org.openecomp.capabilities.Forwarder
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_plt_plt_internal_0_port:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      forwarder_plt_plt_data_port_0:
+        type: org.openecomp.capabilities.Forwarder
         occurrences:
         - 1
         - UNBOUNDED
-      binding_plt_plt_internal_0_port:
+      binding_plt_plt_internal_port_0:
         type: tosca.capabilities.network.Bindable
         valid_source_types:
         - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
@@ -550,11 +575,6 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-      feature_plt_plt_internal_0_port:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
       instance_plt:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -567,198 +587,178 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes.rate_plt:
+      network.incoming.packets.rate_plt_plt_internal_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.ephemeral.size_plt:
+      network.outgoing.bytes_plt_plt_data_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
-      cpu_util_plt:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_plt_plt_data_port_0:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      binding_plt_plt_oam_0_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
-      memory.usage_plt:
+      disk.write.bytes.rate_plt:
         type: org.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_plt_plt_oam_0_port:
-        type: tosca.capabilities.Attachment
+      network.outgoing.packets.rate_plt_plt_data_port_0:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_plt_plt_oam_0_port:
+      disk.ephemeral.size_plt:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.capacity_plt:
+      cpu_util_plt:
         type: org.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_plt_plt_oam_0_port:
-        type: org.openecomp.capabilities.Forwarder
+      attachment_plt_plt_data_port_0:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      binding_plt_plt_data_0_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
-      disk.device.read.requests_plt:
+      network.incoming.packets.rate_plt_plt_data_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_plt:
+      network.incoming.packets.rate_plt_plt_oam_port_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_plt_plt_internal_0_port:
+      network.outgoing.bytes_plt_plt_oam_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
-      scalable_plt:
-        type: tosca.capabilities.Scalable
+      memory.usage_plt:
+        type: org.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_plt_plt_oam_0_port:
+      network.outgoing.bytes.rate_plt_plt_data_port_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_plt_plt_data_0_port:
+      network.outpoing.packets_plt_plt_data_port_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_plt_plt_data_0_port:
+      disk.device.capacity_plt:
         type: org.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_plt:
+      disk.device.read.requests_plt:
         type: org.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_plt_plt_oam_0_port:
-        type: tosca.capabilities.Node
+      forwarder_plt_plt_internal_port_0:
+        type: org.openecomp.capabilities.Forwarder
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_plt_plt_internal_0_port:
+      memory.resident_plt:
         type: org.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_plt:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      scalable_plt:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
-      disk.root.size_plt:
+      network.outpoing.packets_plt_plt_internal_port_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_plt_plt_data_0_port:
+      network.incoming.bytes_plt_plt_data_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
-      cpu.delta_plt:
+      network.outgoing.bytes.rate_plt_plt_oam_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.write.requests_plt:
+      disk.usage_plt:
         type: org.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_plt_plt_data_0_port:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      network.outgoing.bytes.rate_plt_plt_data_0_port:
+      network.incoming.packets_plt_plt_internal_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.rate_plt:
+      memory_plt:
         type: org.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_plt_plt_data_0_port:
+      disk.root.size_plt:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      os_plt:
-        type: tosca.capabilities.OperatingSystem
+      cpu.delta_plt:
+        type: org.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_plt_plt_internal_0_port:
+      disk.device.write.requests_plt:
         type: org.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_plt_plt_internal_0_port:
-        type: org.openecomp.capabilities.Forwarder
+      disk.device.read.requests.rate_plt:
+        type: org.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_plt_plt_data_0_port:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      os_plt:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
@@ -793,66 +793,66 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      forwarder_plt_plt_data_0_port:
-        type: org.openecomp.capabilities.Forwarder
+      attachment_plt_plt_oam_port_0:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
   org.openecomp.resource.abstract.nodes.app:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
-      port_app_data_0_port_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
-        required: true
-        status: SUPPORTED
       compute_app_scheduler_hints:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: json
-      port_app_internal_0_port_ip_requirements:
+      port_app_data_port_0_network:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
-      port_app_data_0_port_network_role:
+          type: string
+      port_app_internal_port_0_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
+        required: true
+        status: SUPPORTED
+      vm_flavor_name:
         type: string
         required: true
         status: SUPPORTED
-      port_app_oam_0_port_replacement_policy:
+      port_app_oam_port_0_security_groups:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
-      port_app_oam_0_port_network:
+          type: json
+      port_app_internal_port_0_allowed_address_pairs:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
-      vm_flavor_name:
-        type: string
+          type: org.openecomp.datatypes.heat.network.AddressPair
+      port_app_oam_port_0_network:
+        type: list
         required: true
         status: SUPPORTED
-      port_app_data_0_port_fixed_ips:
+        entry_schema:
+          type: string
+      port_app_internal_port_0_name:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.heat.neutron.port.FixedIps
+          type: string
       vm_image_name:
         type: string
         required: true
         status: SUPPORTED
-      port_app_oam_0_port_name:
-        type: list
+      port_app_internal_port_0_network_role:
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       compute_app_availability_zone:
         type: list
         required: true
@@ -865,216 +865,216 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: boolean
-      port_app_oam_0_port_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
-        required: true
-        status: SUPPORTED
-      port_app_data_0_port_network:
+      port_app_data_port_0_replacement_policy:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_app_data_0_port_network_role_tag:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_app_oam_0_port_network_role_tag:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_app_data_0_port_exCP_naming:
-        type: org.openecomp.datatypes.Naming
+      port_app_oam_port_0_ip_requirements:
+        type: list
         required: true
         status: SUPPORTED
-      port_app_data_0_port_vlan_requirements:
+        entry_schema:
+          type: org.openecomp.datatypes.network.IpRequirements
+      port_app_data_port_0_name:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
-      port_app_internal_0_port_network_role_tag:
-        type: string
+          type: string
+      port_app_oam_port_0_order:
+        type: integer
         required: true
         status: SUPPORTED
-      port_app_internal_0_port_related_networks:
+      port_app_oam_port_0_fixed_ips:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
-      port_app_oam_0_port_network_role:
-        type: string
+          type: org.openecomp.datatypes.heat.neutron.port.FixedIps
+      port_app_internal_port_0_replacement_policy:
+        type: list
         required: true
         status: SUPPORTED
-      compute_app_metadata:
+        entry_schema:
+          type: string
+      port_app_data_port_0_fixed_ips:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
-      port_app_data_0_port_related_networks:
+          type: org.openecomp.datatypes.heat.neutron.port.FixedIps
+      port_app_data_port_0_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
-      port_app_data_0_port_ip_requirements:
+          type: org.openecomp.datatypes.network.VlanRequirements
+      port_app_data_port_0_exCP_naming:
+        type: org.openecomp.datatypes.Naming
+        required: true
+        status: SUPPORTED
+      compute_app_metadata:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
-      port_app_internal_0_port_network_role:
-        type: string
+          type: json
+      port_app_oam_port_0_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
         required: true
         status: SUPPORTED
-      port_app_internal_0_port_subnetpoolid:
-        type: string
+      port_app_internal_port_0_order:
+        type: integer
         required: true
         status: SUPPORTED
-      port_app_internal_0_port_allowed_address_pairs:
-        type: list
+      port_app_oam_port_0_exCP_naming:
+        type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.heat.network.AddressPair
-      port_app_oam_0_port_related_networks:
+      port_app_internal_port_0_security_groups:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
-      port_app_data_0_port_subnetpoolid:
+          type: json
+      port_app_oam_port_0_network_role:
         type: string
         required: true
         status: SUPPORTED
-      port_app_oam_0_port_subnetpoolid:
+      port_app_internal_port_0_subnetpoolid:
         type: string
         required: true
         status: SUPPORTED
-      port_app_internal_0_port_order:
-        type: integer
+      port_app_data_port_0_network_role:
+        type: string
         required: true
         status: SUPPORTED
-      port_app_internal_0_port_exCP_naming:
-        type: org.openecomp.datatypes.Naming
+      port_app_internal_port_0_vlan_requirements:
+        type: list
         required: true
         status: SUPPORTED
-      port_app_data_0_port_name:
+        entry_schema:
+          type: org.openecomp.datatypes.network.VlanRequirements
+      port_app_oam_port_0_replacement_policy:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_app_oam_0_port_ip_requirements:
+      port_app_data_port_0_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
-      port_app_oam_0_port_exCP_naming:
-        type: org.openecomp.datatypes.Naming
+      port_app_data_port_0_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
         required: true
         status: SUPPORTED
-      port_app_internal_0_port_network:
+      port_app_data_port_0_related_networks:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
-      port_app_data_0_port_security_groups:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+      port_app_internal_port_0_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
-      port_app_oam_0_port_order:
-        type: integer
+          type: org.openecomp.datatypes.network.IpRequirements
+      port_app_data_port_0_network_role_tag:
+        type: string
         required: true
         status: SUPPORTED
-      port_app_internal_0_port_vlan_requirements:
-        type: list
-        required: true
+      index_value:
+        type: integer
+        description: Index value of this substitution service template runtime instance
+        required: false
+        default: 0
         status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
-      port_app_internal_0_port_replacement_policy:
+        constraints:
+        - greater_or_equal: 0
+      compute_app_name:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_app_internal_0_port_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
-        required: true
-        status: SUPPORTED
-      port_app_data_0_port_order:
-        type: integer
+      port_app_oam_port_0_related_networks:
+        type: list
         required: true
         status: SUPPORTED
-      port_app_oam_0_port_security_groups:
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+      port_app_data_port_0_security_groups:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: json
-      port_app_internal_0_port_name:
+      port_app_oam_port_0_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
-      index_value:
+          type: org.openecomp.datatypes.network.VlanRequirements
+      port_app_oam_port_0_subnetpoolid:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_app_data_port_0_order:
         type: integer
-        description: Index value of this substitution service template runtime instance
-        required: false
-        default: 0
+        required: true
         status: SUPPORTED
-        constraints:
-        - greater_or_equal: 0
-      port_app_oam_0_port_fixed_ips:
-        type: list
+      port_app_data_port_0_subnetpoolid:
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.heat.neutron.port.FixedIps
-      port_app_data_0_port_replacement_policy:
+      port_app_internal_port_0_network:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      compute_app_name:
+      compute_app_image_update_policy:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_app_oam_0_port_vlan_requirements:
+      port_app_internal_port_0_related_networks:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
-      port_app_internal_0_port_security_groups:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+      port_app_oam_port_0_name:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
-      compute_app_image_update_policy:
-        type: list
+          type: string
+      port_app_oam_port_0_network_role_tag:
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       compute_app_user_data_format:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
+      port_app_internal_port_0_network_role_tag:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_app_internal_port_0_exCP_naming:
+        type: org.openecomp.datatypes.Naming
+        required: true
+        status: SUPPORTED
     requirements:
     - dependency_app:
         capability: tosca.capabilities.Node
@@ -1090,40 +1090,40 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_app_app_internal_0_port:
+    - dependency_app_app_data_port_0:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_app_app_internal_0_port:
+    - link_app_app_data_port_0:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
         - 1
         - 1
-    - dependency_app_app_oam_0_port:
+    - dependency_app_app_internal_port_0:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_app_app_oam_0_port:
+    - link_app_app_internal_port_0:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
         - 1
         - 1
-    - dependency_app_app_data_0_port:
+    - dependency_app_app_oam_port_0:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_app_app_data_0_port:
+    - link_app_app_oam_port_0:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
@@ -1136,8 +1136,9 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      feature_app_app_oam_0_port:
-        type: tosca.capabilities.Node
+      network.incoming.bytes_app_app_data_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
@@ -1159,25 +1160,13 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_app_app_oam_0_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.bytes.rate_app_app_data_0_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.bytes_app_app_oam_0_port:
+      network.outpoing.packets_app_app_internal_port_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_app_app_internal_0_port:
+      network.outgoing.bytes.rate_app_app_data_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:
@@ -1214,8 +1203,15 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      forwarder_app_app_oam_0_port:
-        type: org.openecomp.capabilities.Forwarder
+      network.outgoing.packets.rate_app_app_oam_port_0:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.incoming.packets_app_app_internal_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
@@ -1225,7 +1221,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_app_app_oam_0_port:
+      network.incoming.bytes.rate_app_app_oam_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:
@@ -1243,13 +1239,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      binding_app_app_data_0_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
+      network.outgoing.bytes_app_app_internal_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:
-        - 0
+        - 1
         - UNBOUNDED
       disk.device.read.requests.rate_app:
         type: org.openecomp.capabilities.metric.Ceilometer
@@ -1257,20 +1251,41 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      vcpus_app:
+      network.outgoing.bytes.rate_app_app_oam_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_app:
+      network.incoming.bytes.rate_app_app_data_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
-      feature_app_app_internal_0_port:
-        type: tosca.capabilities.Node
+      network.outgoing.bytes_app_app_oam_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
+      vcpus_app:
+        type: org.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_app_app_internal_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:
+        - 0
+        - UNBOUNDED
+      disk.device.read.requests_app:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
@@ -1280,12 +1295,17 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      attachment_app_app_internal_port_0:
+        type: tosca.capabilities.Attachment
+        occurrences:
+        - 1
+        - UNBOUNDED
       endpoint_app:
         type: tosca.capabilities.Endpoint.Admin
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_app_app_data_0_port:
+      network.incoming.bytes.rate_app_app_internal_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:
@@ -1309,6 +1329,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      attachment_app_app_data_port_0:
+        type: tosca.capabilities.Attachment
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.latency_app:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -1321,174 +1346,171 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_app_app_oam_0_port:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
       os_app:
         type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_app_app_internal_0_port:
+      network.outgoing.bytes_app_app_data_port_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_app_app_oam_0_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_app_app_oam_port_0:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_app_app_internal_0_port:
+      memory_app:
         type: org.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_app_app_oam_0_port:
+      disk.read.requests_app:
         type: org.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_app_app_internal_0_port:
+      forwarder_app_app_oam_port_0:
         type: org.openecomp.capabilities.Forwarder
         occurrences:
         - 1
         - UNBOUNDED
-      memory_app:
+      disk.write.bytes_app:
         type: org.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_app:
+      binding_app_app_data_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:
+        - 0
+        - UNBOUNDED
+      disk.allocation_app:
         type: org.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_app_app_oam_0_port:
+      network.incoming.packets_app_app_data_port_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_app_app_data_0_port:
+      memory.resident_app:
         type: org.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_app:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      binding_app_app_oam_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:
+        - 0
+        - UNBOUNDED
+      feature_app_app_internal_port_0:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.allocation_app:
+      cpu_app:
         type: org.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_app_app_internal_0_port:
+      disk.usage_app:
         type: org.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_app_app_data_0_port:
-        type: tosca.capabilities.Attachment
+      feature_app:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_app_app_oam_0_port:
+      disk.read.bytes_app:
         type: org.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_app_app_internal_0_port:
+      network.outpoing.packets_app_app_data_port_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_app_app_internal_0_port:
+      network.incoming.bytes_app_app_oam_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_app:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      scalable_app:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_app_app_oam_0_port:
+      network.incoming.bytes_app_app_internal_port_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_app_app_data_0_port:
+      network.outgoing.bytes.rate_app_app_internal_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
-      cpu_app:
+      network.outpoing.packets_app_app_oam_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
-      feature_app_app_data_0_port:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.usage_app:
+      network.incoming.packets.rate_app_app_data_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
-      feature_app:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.read.bytes_app:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      forwarder_app_app_internal_port_0:
+        type: org.openecomp.capabilities.Forwarder
         occurrences:
         - 1
         - UNBOUNDED
-      scalable_app:
-        type: tosca.capabilities.Scalable
+      forwarder_app_app_data_port_0:
+        type: org.openecomp.capabilities.Forwarder
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_app_app_data_0_port:
+      disk.device.read.bytes.rate_app:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes.rate_app:
+      disk.device.allocation_app:
         type: org.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_app:
+      network.incoming.packets.rate_app_app_internal_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:
@@ -1505,75 +1527,53 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      binding_app_app_oam_0_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
       disk.device.usage_app:
         type: org.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_app_app_data_0_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_app_app_data_port_0:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_app_app_data_0_port:
+      network.outgoing.packets.rate_app_app_internal_port_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_app_app_internal_0_port:
+      network.incoming.packets.rate_app_app_oam_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
-      forwarder_app_app_data_0_port:
-        type: org.openecomp.capabilities.Forwarder
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.write.requests_app:
+      network.incoming.packets_app_app_oam_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
-      binding_app_app_internal_0_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
-      instance_app:
+      disk.write.requests_app:
         type: org.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_app_app_internal_0_port:
+      attachment_app_app_oam_port_0:
         type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_app_app_data_0_port:
+      network.outgoing.packets.rate_app_app_data_port_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_app_app_internal_0_port:
+      instance_app:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -1588,70 +1588,48 @@ node_types:
   org.openecomp.resource.abstract.nodes.iox:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
-      port_iox_data_0_port_ip_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
-      port_iox_oam_0_port_exCP_naming:
-        type: org.openecomp.datatypes.Naming
-        required: true
-        status: SUPPORTED
-      port_iox_internal_0_port_network:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: string
-      port_iox_data_0_port_name:
-        type: list
+      port_iox_oam_port_0_network_role:
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
-      port_iox_data_0_port_related_networks:
+      port_iox_oam_port_0_fixed_ips:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
-      vm_flavor_name:
+          type: org.openecomp.datatypes.heat.neutron.port.FixedIps
+      port_iox_data_port_0_network_role:
         type: string
         required: true
         status: SUPPORTED
-      port_iox_data_0_port_subnetpoolid:
+      vm_flavor_name:
         type: string
         required: true
         status: SUPPORTED
-      port_iox_data_0_port_allowed_address_pairs:
-        type: list
+      port_iox_oam_port_0_exCP_naming:
+        type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.heat.network.AddressPair
-      port_iox_internal_0_port_ip_requirements:
-        type: list
+      port_iox_data_port_0_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
       vm_image_name:
         type: string
         required: true
         status: SUPPORTED
-      port_iox_oam_0_port_name:
+      port_iox_oam_port_0_replacement_policy:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_iox_oam_0_port_network_role_tag:
-        type: string
+      port_iox_oam_port_0_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
         required: true
         status: SUPPORTED
-      port_iox_oam_0_port_subnetpoolid:
-        type: string
+      port_iox_internal_port_0_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
         required: true
         status: SUPPORTED
       compute_iox_user_data_format:
@@ -1660,145 +1638,175 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      port_iox_data_0_port_fixed_ips:
-        type: list
+      port_iox_internal_port_0_subnetpoolid:
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.heat.neutron.port.FixedIps
-      port_iox_internal_0_port_allowed_address_pairs:
+      port_iox_data_port_0_allowed_address_pairs:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: org.openecomp.datatypes.heat.network.AddressPair
-      compute_iox_config_drive:
+      port_iox_data_port_0_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: boolean
-      port_iox_internal_0_port_order:
-        type: integer
-        required: true
-        status: SUPPORTED
-      port_iox_oam_0_port_replacement_policy:
+          type: org.openecomp.datatypes.network.IpRequirements
+      port_iox_internal_port_0_related_networks:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
-      port_iox_data_0_port_security_groups:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+      compute_iox_config_drive:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
-      port_iox_internal_0_port_vlan_requirements:
+          type: boolean
+      port_iox_internal_port_0_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
-      compute_iox_image_update_policy:
+      port_iox_internal_port_0_order:
+        type: integer
+        required: true
+        status: SUPPORTED
+      port_iox_data_port_0_network:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_iox_oam_0_port_order:
+      port_iox_internal_port_0_network_role_tag:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_iox_oam_port_0_order:
         type: integer
         required: true
         status: SUPPORTED
-      port_iox_oam_0_port_network:
+      compute_iox_image_update_policy:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_iox_oam_0_port_related_networks:
+      port_iox_data_port_0_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
-      port_iox_internal_0_port_security_groups:
+          type: org.openecomp.datatypes.network.VlanRequirements
+      port_iox_data_port_0_network_role_tag:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_iox_internal_port_0_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
-      port_iox_oam_0_port_vlan_requirements:
+          type: org.openecomp.datatypes.network.IpRequirements
+      port_iox_oam_port_0_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
-      port_iox_data_0_port_order:
+      port_iox_data_port_0_order:
         type: integer
         required: true
         status: SUPPORTED
-      port_iox_internal_0_port_name:
+      compute_iox_name:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_iox_oam_0_port_fixed_ips:
+      port_iox_oam_port_0_allowed_address_pairs:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.heat.neutron.port.FixedIps
-      port_iox_data_0_port_vlan_requirements:
+          type: org.openecomp.datatypes.heat.network.AddressPair
+      port_iox_oam_port_0_network:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
-      compute_iox_name:
+          type: string
+      port_iox_internal_port_0_name:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_iox_data_0_port_network:
+      port_iox_internal_port_0_allowed_address_pairs:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
-      port_iox_internal_0_port_replacement_policy:
+          type: org.openecomp.datatypes.heat.network.AddressPair
+      port_iox_oam_port_0_network_role_tag:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_iox_data_port_0_fixed_ips:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
-      port_iox_internal_0_port_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
+          type: org.openecomp.datatypes.heat.neutron.port.FixedIps
+      port_iox_data_port_0_subnetpoolid:
+        type: string
         required: true
         status: SUPPORTED
-      port_iox_data_0_port_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
+      port_iox_oam_port_0_security_groups:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_iox_internal_port_0_security_groups:
+        type: list
         required: true
         status: SUPPORTED
-      port_iox_data_0_port_exCP_naming:
+        entry_schema:
+          type: json
+      port_iox_oam_port_0_ip_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.IpRequirements
+      port_iox_data_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
-      port_iox_oam_0_port_network_role:
-        type: string
+      port_iox_data_port_0_related_networks:
+        type: list
         required: true
         status: SUPPORTED
-      port_iox_internal_0_port_network_role:
-        type: string
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+      port_iox_data_port_0_security_groups:
+        type: list
         required: true
         status: SUPPORTED
-      port_iox_data_0_port_network_role:
-        type: string
+        entry_schema:
+          type: json
+      port_iox_internal_port_0_network:
+        type: list
         required: true
         status: SUPPORTED
-      port_iox_data_0_port_replacement_policy:
+        entry_schema:
+          type: string
+      port_iox_internal_port_0_replacement_policy:
         type: list
         required: true
         status: SUPPORTED
@@ -1810,6 +1818,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: json
+      port_iox_data_port_0_name:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
@@ -1818,23 +1832,15 @@ node_types:
         status: SUPPORTED
         constraints:
         - greater_or_equal: 0
-      port_iox_internal_0_port_network_role_tag:
+      port_iox_internal_port_0_network_role:
         type: string
         required: true
         status: SUPPORTED
-      port_iox_internal_0_port_related_networks:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
-      port_iox_oam_0_port_allowed_address_pairs:
-        type: list
+      port_iox_internal_port_0_exCP_naming:
+        type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.heat.network.AddressPair
-      port_iox_internal_0_port_subnetpoolid:
+      port_iox_oam_port_0_subnetpoolid:
         type: string
         required: true
         status: SUPPORTED
@@ -1844,44 +1850,25 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      port_iox_oam_0_port_security_groups:
+      port_iox_oam_port_0_related_networks:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
-      port_iox_oam_0_port_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
-        required: true
-        status: SUPPORTED
-      port_iox_oam_0_port_ip_requirements:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+      port_iox_data_port_0_replacement_policy:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
-      port_iox_internal_0_port_exCP_naming:
-        type: org.openecomp.datatypes.Naming
-        required: true
-        status: SUPPORTED
-      port_iox_data_0_port_network_role_tag:
-        type: string
+          type: string
+      port_iox_oam_port_0_name:
+        type: list
         required: true
         status: SUPPORTED
+        entry_schema:
+          type: string
     requirements:
-    - dependency_iox_iox_data_0_port:
-        capability: tosca.capabilities.Node
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.DependsOn
-        occurrences:
-        - 0
-        - UNBOUNDED
-    - link_iox_iox_data_0_port:
-        capability: tosca.capabilities.network.Linkable
-        relationship: tosca.relationships.network.LinksTo
-        occurrences:
-        - 1
-        - 1
     - dependency_iox:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
@@ -1896,38 +1883,46 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_iox_iox_oam_0_port:
+    - dependency_iox_iox_internal_port_0:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_iox_iox_oam_0_port:
+    - link_iox_iox_internal_port_0:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
         - 1
         - 1
-    - dependency_iox_iox_internal_0_port:
+    - dependency_iox_iox_oam_port_0:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_iox_iox_internal_0_port:
+    - link_iox_iox_oam_port_0:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
         - 1
         - 1
-    capabilities:
-      forwarder_iox_iox_oam_0_port:
-        type: org.openecomp.capabilities.Forwarder
+    - dependency_iox_iox_data_port_0:
+        capability: tosca.capabilities.Node
+        node: tosca.nodes.Root
+        relationship: tosca.relationships.DependsOn
         occurrences:
-        - 1
+        - 0
         - UNBOUNDED
+    - link_iox_iox_data_port_0:
+        capability: tosca.capabilities.network.Linkable
+        relationship: tosca.relationships.network.LinksTo
+        occurrences:
+        - 1
+        - 1
+    capabilities:
       cpu.delta_iox:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -1946,19 +1941,19 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_iox_iox_data_0_port:
+      disk.device.read.bytes_iox:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes_iox:
+      disk.read.requests_iox:
         type: org.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_iox:
+      network.incoming.packets_iox_iox_data_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:
@@ -1970,13 +1965,13 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_iox_iox_oam_0_port:
+      network.outpoing.packets_iox_iox_internal_port_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_iox_iox_internal_0_port:
+      network.incoming.packets.rate_iox_iox_data_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:
@@ -2006,121 +2001,122 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests_iox:
+      network.outgoing.packets.rate_iox_iox_internal_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.allocation_iox:
+      network.incoming.packets_iox_iox_internal_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
-      feature_iox_iox_data_0_port:
-        type: tosca.capabilities.Node
+      disk.device.write.requests_iox:
+        type: org.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_iox:
+      disk.device.allocation_iox:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      vcpus_iox:
+      disk.root.size_iox:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.iops_iox:
+      network.outgoing.bytes.rate_iox_iox_oam_port_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_iox_iox_data_0_port:
+      vcpus_iox:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes.rate_iox:
+      disk.device.iops_iox:
         type: org.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_iox_iox_oam_0_port:
+      network.outgoing.bytes_iox_iox_data_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_iox_iox_data_0_port:
-        type: tosca.capabilities.Attachment
+      disk.read.bytes.rate_iox:
+        type: org.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_iox_iox_oam_0_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_iox_iox_oam_port_0:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.latency_iox:
+      network.outgoing.bytes_iox_iox_internal_port_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_iox_iox_data_0_port:
+      binding_iox_iox_data_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:
+        - 0
+        - UNBOUNDED
+      network.incoming.packets.rate_iox_iox_internal_port_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_iox_iox_internal_0_port:
+      disk.latency_iox:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_util_iox:
+      network.incoming.bytes.rate_iox_iox_data_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
-      binding_iox_iox_oam_0_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
-      network.incoming.bytes_iox_iox_data_0_port:
+      network.incoming.packets.rate_iox_iox_oam_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.capacity_iox:
+      cpu_util_iox:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.iops_iox:
+      disk.device.capacity_iox:
         type: org.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_iox_iox_internal_0_port:
+      disk.iops_iox:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -2131,14 +2127,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      binding_iox_iox_internal_0_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
       disk.device.read.requests_iox:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -2151,28 +2139,17 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_iox_iox_internal_0_port:
+      attachment_iox_iox_data_port_0:
         type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_iox_iox_internal_0_port:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
       cpu_iox:
         type: org.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_iox_iox_oam_0_port:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
       disk.usage_iox:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -2189,45 +2166,41 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      memory.resident_iox:
+      network.incoming.bytes_iox_iox_data_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.write.bytes_iox:
+      memory.resident_iox:
         type: org.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_iox_iox_internal_0_port:
+      disk.device.write.bytes_iox:
         type: org.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_iox_iox_data_0_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
+      attachment_iox_iox_oam_port_0:
+        type: tosca.capabilities.Attachment
         occurrences:
-        - 0
+        - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_iox_iox_oam_0_port:
+      network.incoming.packets_iox_iox_oam_port_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_iox_iox_internal_0_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_iox_iox_internal_port_0:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_iox_iox_oam_0_port:
+      network.outpoing.packets_iox_iox_oam_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:
@@ -2239,7 +2212,20 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_iox_iox_oam_0_port:
+      forwarder_iox_iox_internal_port_0:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      binding_iox_iox_oam_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:
+        - 0
+        - UNBOUNDED
+      network.incoming.bytes_iox_iox_internal_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:
@@ -2255,6 +2241,14 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      binding_iox_iox_internal_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:
+        - 0
+        - UNBOUNDED
       host_iox:
         type: tosca.capabilities.Container
         valid_source_types:
@@ -2262,107 +2256,113 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests.rate_iox:
+      network.outgoing.packets.rate_iox_iox_oam_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.write.bytes.rate_iox:
+      disk.write.requests.rate_iox:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes_iox:
+      disk.write.bytes.rate_iox:
         type: org.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_iox_iox_oam_0_port:
+      disk.read.bytes_iox:
         type: org.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_iox:
+      network.outgoing.bytes.rate_iox_iox_internal_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.ephemeral.size_iox:
+      instance_iox:
         type: org.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_iox_iox_data_0_port:
+      disk.ephemeral.size_iox:
         type: org.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_iox_iox_oam_0_port:
+      attachment_iox_iox_internal_port_0:
         type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      feature_iox_iox_internal_0_port:
-        type: tosca.capabilities.Node
+      forwarder_iox_iox_data_port_0:
+        type: org.openecomp.capabilities.Forwarder
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_iox_iox_internal_0_port:
+      network.incoming.bytes.rate_iox_iox_internal_port_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_iox_iox_oam_0_port:
+      forwarder_iox_iox_oam_port_0:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.incoming.bytes_iox_iox_oam_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
-      forwarder_iox_iox_data_0_port:
-        type: org.openecomp.capabilities.Forwarder
+      feature_iox_iox_data_port_0:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes.rate_iox:
+      network.incoming.bytes.rate_iox_iox_oam_port_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_iox_iox_data_0_port:
+      network.outgoing.bytes_iox_iox_oam_port_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_iox_iox_data_0_port:
+      disk.device.read.bytes.rate_iox:
         type: org.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_iox:
+      network.outpoing.packets_iox_iox_data_port_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_iox_iox_internal_0_port:
+      network.outgoing.bytes.rate_iox_iox_data_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
-      forwarder_iox_iox_internal_0_port:
-        type: org.openecomp.capabilities.Forwarder
+      disk.device.write.bytes.rate_iox:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
@@ -2372,7 +2372,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_iox_iox_data_0_port:
+      network.outgoing.packets.rate_iox_iox_data_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:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/MainServiceTemplate.yaml
index bc241a4c9c..40695ff356 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/MainServiceTemplate.yaml
@@ -902,92 +902,97 @@ topology_template:
       directives:
       - substitutable
       properties:
-        port_iox_data_0_port_ip_requirements:
-        - ip_version: 6
-          ip_count_required:
-            is_required: true
-          floating_ip_count_required:
-            is_required: false
-        port_iox_internal_0_port_network:
-        - internal_net_0
-        port_iox_data_0_port_name:
-        - str_replace:
-            template: $vnf_name-iox_data_1_port_0
-            params:
-              $vnf_name:
-                get_input: vnf_name
+        port_iox_oam_port_0_fixed_ips:
+        - ip_address:
+            get_input:
+            - iox_oam_ips
+            - 1
         vm_flavor_name:
           get_input: iox_flavor_name
-        port_iox_data_0_port_allowed_address_pairs:
+        port_iox_data_port_0_mac_requirements:
+          mac_count_required:
+            is_required: false
+        vm_image_name:
+          get_input: iox_image_name
+        port_iox_oam_port_0_replacement_policy:
+        - AUTO
+        port_iox_oam_port_0_mac_requirements:
+          mac_count_required:
+            is_required: false
+        port_iox_internal_port_0_mac_requirements:
+          mac_count_required:
+            is_required: false
+        compute_iox_user_data_format:
+        - RAW
+        port_iox_data_port_0_allowed_address_pairs:
         - ip_address:
             get_attribute:
             - network:data:vip:m004:m003
             - fixed_ips
             - 0
             - ip_address
-        port_iox_internal_0_port_ip_requirements:
-        - ip_version: 4
+        port_iox_data_port_0_ip_requirements:
+        - ip_version: 6
           ip_count_required:
-            is_required: false
+            is_required: true
           floating_ip_count_required:
             is_required: false
-        vm_image_name:
-          get_input: iox_image_name
-        port_iox_oam_0_port_name:
-        - str_replace:
-            template: $vnf_name-iox_oam_1_port_0
-            params:
-              $vnf_name:
-                get_input: vnf_name
-        port_iox_oam_0_port_network_role_tag: oam
-        compute_iox_user_data_format:
-        - RAW
-        port_iox_data_0_port_fixed_ips:
-        - ip_address:
-            get_input:
-            - iox_data_v6_ips
-            - 1
-        port_iox_internal_0_port_allowed_address_pairs:
-        - ip_address:
-            get_input: internal_subnet_cidr
         compute_iox_config_drive:
         - true
-        port_iox_oam_0_port_replacement_policy:
-        - AUTO
-        port_iox_data_0_port_security_groups:
-        - get_input: data_security_groups
+        port_iox_data_port_0_network:
+        - get_input: data_net_id
         compute_iox_image_update_policy:
         - REBUILD
-        port_iox_oam_0_port_network:
+        port_iox_data_port_0_network_role_tag: data
+        port_iox_internal_port_0_ip_requirements:
+        - ip_version: 4
+          ip_count_required:
+            is_required: false
+          floating_ip_count_required:
+            is_required: false
+        compute_iox_name:
+        - get_input:
+          - iox_names
+          - 1
+        port_iox_oam_port_0_allowed_address_pairs:
+        - ip_address:
+            get_attribute:
+            - network:io:vip:m004:m003
+            - fixed_ips
+            - 0
+            - ip_address
+        port_iox_oam_port_0_network:
         - get_input: oam_net_id
-        port_iox_internal_0_port_security_groups:
-        - get_input: iox_security_groups
-        port_iox_internal_0_port_name:
+        port_iox_internal_port_0_name:
         - str_replace:
             template: $vnf_name-iox_internal_1_port_0
             params:
               $vnf_name:
                 get_input: vnf_name
-        port_iox_oam_0_port_fixed_ips:
+        port_iox_internal_port_0_allowed_address_pairs:
+        - ip_address:
+            get_input: internal_subnet_cidr
+        port_iox_oam_port_0_network_role_tag: oam
+        port_iox_data_port_0_fixed_ips:
         - ip_address:
             get_input:
-            - iox_oam_ips
+            - iox_data_v6_ips
             - 1
-        compute_iox_name:
-        - get_input:
-          - iox_names
-          - 1
-        port_iox_data_0_port_network:
-        - get_input: data_net_id
-        port_iox_internal_0_port_replacement_policy:
-        - AUTO
-        port_iox_internal_0_port_mac_requirements:
-          mac_count_required:
-            is_required: false
-        port_iox_data_0_port_mac_requirements:
-          mac_count_required:
+        port_iox_oam_port_0_security_groups:
+        - get_input: oam_security_groups
+        port_iox_internal_port_0_security_groups:
+        - get_input: iox_security_groups
+        port_iox_oam_port_0_ip_requirements:
+        - ip_version: 4
+          ip_count_required:
+            is_required: true
+          floating_ip_count_required:
             is_required: false
-        port_iox_data_0_port_replacement_policy:
+        port_iox_data_port_0_security_groups:
+        - get_input: data_security_groups
+        port_iox_internal_port_0_network:
+        - internal_net_0
+        port_iox_internal_port_0_replacement_policy:
         - AUTO
         compute_iox_metadata:
         - vf_module_id:
@@ -999,27 +1004,22 @@ topology_template:
             get_input: vnf_name
           vf_module_name:
             get_input: vf_module_name
-        port_iox_oam_0_port_allowed_address_pairs:
-        - ip_address:
-            get_attribute:
-            - network:io:vip:m004:m003
-            - fixed_ips
-            - 0
-            - ip_address
+        port_iox_data_port_0_name:
+        - str_replace:
+            template: $vnf_name-iox_data_1_port_0
+            params:
+              $vnf_name:
+                get_input: vnf_name
         compute_iox_availability_zone:
         - get_input: availability_zone_1
-        port_iox_oam_0_port_security_groups:
-        - get_input: oam_security_groups
-        port_iox_oam_0_port_mac_requirements:
-          mac_count_required:
-            is_required: false
-        port_iox_oam_0_port_ip_requirements:
-        - ip_version: 4
-          ip_count_required:
-            is_required: true
-          floating_ip_count_required:
-            is_required: false
-        port_iox_data_0_port_network_role_tag: data
+        port_iox_data_port_0_replacement_policy:
+        - AUTO
+        port_iox_oam_port_0_name:
+        - str_replace:
+            template: $vnf_name-iox_oam_1_port_0
+            params:
+              $vnf_name:
+                get_input: vnf_name
         service_template_filter:
           substitute_service_template: Nested_ioxServiceTemplate.yaml
           count: 1
@@ -1029,7 +1029,7 @@ topology_template:
           - service_template_filter
           - index_value
       requirements:
-      - link_iox_iox_internal_0_port:
+      - link_iox_iox_internal_port_0:
           capability: tosca.capabilities.network.Linkable
           node: internal_net_0
           relationship: tosca.relationships.network.LinksTo
@@ -1038,42 +1038,55 @@ topology_template:
       directives:
       - substitutable
       properties:
-        port_app_data_0_port_mac_requirements:
-          mac_count_required:
-            is_required: false
         compute_app_scheduler_hints:
         - group: app_server_group_group
-        port_app_internal_0_port_ip_requirements:
-        - ip_version: 4
-          ip_count_required:
-            is_required: false
-          floating_ip_count_required:
+        port_app_data_port_0_network:
+        - get_input: data_net_id
+        port_app_internal_port_0_mac_requirements:
+          mac_count_required:
             is_required: false
-        port_app_oam_0_port_replacement_policy:
-        - AUTO
-        port_app_oam_0_port_network:
-        - get_input: oam_net_id
         vm_flavor_name:
           get_input: app_flavor_name
-        vm_image_name:
-          get_input: app_image_name
-        port_app_oam_0_port_name:
+        port_app_oam_port_0_security_groups:
+        - get_input: oam_security_groups
+        port_app_internal_port_0_allowed_address_pairs:
+        - ip_address:
+            get_input: internal_subnet_cidr
+        port_app_oam_port_0_network:
+        - get_input: oam_net_id
+        port_app_internal_port_0_name:
         - str_replace:
-            template: $vnf_name-app_oam_2_port_0
+            template: $vnf_name-app_internal_2_port_0
             params:
               $vnf_name:
                 get_input: vnf_name
+        vm_image_name:
+          get_input: app_image_name
         compute_app_availability_zone:
         - get_input: availability_zone_0
         compute_app_config_drive:
         - true
-        port_app_oam_0_port_mac_requirements:
-          mac_count_required:
+        port_app_data_port_0_replacement_policy:
+        - AUTO
+        port_app_oam_port_0_ip_requirements:
+        - ip_version: 4
+          ip_count_required:
+            is_required: true
+          floating_ip_count_required:
             is_required: false
-        port_app_data_0_port_network:
-        - get_input: data_net_id
-        port_app_data_0_port_network_role_tag: data
-        port_app_oam_0_port_network_role_tag: oam
+        port_app_data_port_0_name:
+        - str_replace:
+            template: $vnf_name-app_data_2_port_0
+            params:
+              $vnf_name:
+                get_input: vnf_name
+        port_app_oam_port_0_fixed_ips:
+        - ip_address:
+            get_input:
+            - app_oam_ips
+            - 2
+        port_app_internal_port_0_replacement_policy:
+        - AUTO
         compute_app_metadata:
         - vf_module_id:
             get_input: vf_module_id
@@ -1084,59 +1097,46 @@ topology_template:
             get_input: vnf_name
           vf_module_name:
             get_input: vf_module_name
-        port_app_data_0_port_ip_requirements:
+        port_app_oam_port_0_mac_requirements:
+          mac_count_required:
+            is_required: false
+        port_app_internal_port_0_security_groups:
+        - get_input: app_security_groups
+        port_app_oam_port_0_replacement_policy:
+        - AUTO
+        port_app_data_port_0_ip_requirements:
         - ip_version: 4
           ip_count_required:
             is_required: false
           floating_ip_count_required:
             is_required: false
-        port_app_internal_0_port_allowed_address_pairs:
-        - ip_address:
-            get_input: internal_subnet_cidr
-        port_app_data_0_port_name:
-        - str_replace:
-            template: $vnf_name-app_data_2_port_0
-            params:
-              $vnf_name:
-                get_input: vnf_name
-        port_app_oam_0_port_ip_requirements:
+        port_app_data_port_0_mac_requirements:
+          mac_count_required:
+            is_required: false
+        port_app_internal_port_0_ip_requirements:
         - ip_version: 4
           ip_count_required:
-            is_required: true
-          floating_ip_count_required:
             is_required: false
-        port_app_internal_0_port_network:
-        - internal_net_0
-        port_app_data_0_port_security_groups:
-        - get_input: data_security_groups
-        port_app_internal_0_port_replacement_policy:
-        - AUTO
-        port_app_internal_0_port_mac_requirements:
-          mac_count_required:
+          floating_ip_count_required:
             is_required: false
-        port_app_oam_0_port_security_groups:
-        - get_input: oam_security_groups
-        port_app_internal_0_port_name:
-        - str_replace:
-            template: $vnf_name-app_internal_2_port_0
-            params:
-              $vnf_name:
-                get_input: vnf_name
-        port_app_oam_0_port_fixed_ips:
-        - ip_address:
-            get_input:
-            - app_oam_ips
-            - 2
-        port_app_data_0_port_replacement_policy:
-        - AUTO
+        port_app_data_port_0_network_role_tag: data
         compute_app_name:
         - get_input:
           - app_names
           - 2
-        port_app_internal_0_port_security_groups:
-        - get_input: app_security_groups
+        port_app_data_port_0_security_groups:
+        - get_input: data_security_groups
+        port_app_internal_port_0_network:
+        - internal_net_0
         compute_app_image_update_policy:
         - REBUILD
+        port_app_oam_port_0_name:
+        - str_replace:
+            template: $vnf_name-app_oam_2_port_0
+            params:
+              $vnf_name:
+                get_input: vnf_name
+        port_app_oam_port_0_network_role_tag: oam
         compute_app_user_data_format:
         - RAW
         service_template_filter:
@@ -1148,7 +1148,7 @@ topology_template:
           - service_template_filter
           - index_value
       requirements:
-      - link_app_app_internal_0_port:
+      - link_app_app_internal_port_0:
           capability: tosca.capabilities.network.Linkable
           node: internal_net_0
           relationship: tosca.relationships.network.LinksTo
@@ -1187,87 +1187,92 @@ topology_template:
       directives:
       - substitutable
       properties:
-        port_iox_data_0_port_ip_requirements:
-        - ip_version: 6
-          ip_count_required:
-            is_required: true
-          floating_ip_count_required:
-            is_required: false
-        port_iox_internal_0_port_network:
-        - internal_net_0
-        port_iox_data_0_port_name:
-        - str_replace:
-            template: $vnf_name-iox_data_0_port_0
-            params:
-              $vnf_name:
-                get_input: vnf_name
         vm_flavor_name:
           get_input: iox_flavor_name
-        port_iox_data_0_port_allowed_address_pairs:
+        port_iox_data_port_0_mac_requirements:
+          mac_count_required:
+            is_required: false
+        vm_image_name:
+          get_input: iox_image_name
+        port_iox_oam_port_0_replacement_policy:
+        - AUTO
+        port_iox_oam_port_0_mac_requirements:
+          mac_count_required:
+            is_required: false
+        port_iox_internal_port_0_mac_requirements:
+          mac_count_required:
+            is_required: false
+        compute_iox_user_data_format:
+        - RAW
+        port_iox_data_port_0_allowed_address_pairs:
         - ip_address:
             get_attribute:
             - network:data:vip:m004:m003
             - fixed_ips
             - 0
             - ip_address
-        port_iox_internal_0_port_ip_requirements:
+        port_iox_data_port_0_ip_requirements:
+        - ip_version: 6
+          ip_count_required:
+            is_required: true
+          floating_ip_count_required:
+            is_required: false
+        compute_iox_config_drive:
+        - true
+        port_iox_data_port_0_network:
+        - get_input: data_net_id
+        compute_iox_image_update_policy:
+        - REBUILD
+        port_iox_data_port_0_network_role_tag: data
+        port_iox_internal_port_0_ip_requirements:
         - ip_version: 4
           ip_count_required:
             is_required: false
           floating_ip_count_required:
             is_required: false
-        vm_image_name:
-          get_input: iox_image_name
-        port_iox_oam_0_port_name:
+        compute_iox_name:
+        - get_input:
+          - iox_names
+          - 0
+        port_iox_oam_port_0_allowed_address_pairs:
+        - ip_address:
+            get_attribute:
+            - network:io:vip:m004:m003
+            - fixed_ips
+            - 0
+            - ip_address
+        port_iox_oam_port_0_network:
+        - get_input: oam_net_id
+        port_iox_internal_port_0_name:
         - str_replace:
-            template: $vnf_name-iox_oam_0_port_0
+            template: $vnf_name-iox_internal_0_port_0
             params:
               $vnf_name:
                 get_input: vnf_name
-        port_iox_oam_0_port_network_role_tag: oam
-        compute_iox_user_data_format:
-        - RAW
-        port_iox_data_0_port_fixed_ips:
+        port_iox_internal_port_0_allowed_address_pairs:
+        - ip_address:
+            get_input: internal_subnet_cidr
+        port_iox_oam_port_0_network_role_tag: oam
+        port_iox_data_port_0_fixed_ips:
         - ip_address:
             get_input:
             - iox_data_v6_ips
             - 0
-        port_iox_internal_0_port_allowed_address_pairs:
-        - ip_address:
-            get_input: internal_subnet_cidr
-        compute_iox_config_drive:
-        - true
-        port_iox_oam_0_port_replacement_policy:
-        - AUTO
-        port_iox_data_0_port_security_groups:
-        - get_input: data_security_groups
-        compute_iox_image_update_policy:
-        - REBUILD
-        port_iox_oam_0_port_network:
-        - get_input: oam_net_id
-        port_iox_internal_0_port_security_groups:
+        port_iox_oam_port_0_security_groups:
+        - get_input: oam_security_groups
+        port_iox_internal_port_0_security_groups:
         - get_input: iox_security_groups
-        port_iox_internal_0_port_name:
-        - str_replace:
-            template: $vnf_name-iox_internal_0_port_0
-            params:
-              $vnf_name:
-                get_input: vnf_name
-        compute_iox_name:
-        - get_input:
-          - iox_names
-          - 0
-        port_iox_data_0_port_network:
-        - get_input: data_net_id
-        port_iox_internal_0_port_replacement_policy:
-        - AUTO
-        port_iox_internal_0_port_mac_requirements:
-          mac_count_required:
+        port_iox_oam_port_0_ip_requirements:
+        - ip_version: 4
+          ip_count_required:
             is_required: false
-        port_iox_data_0_port_mac_requirements:
-          mac_count_required:
+          floating_ip_count_required:
             is_required: false
-        port_iox_data_0_port_replacement_policy:
+        port_iox_data_port_0_security_groups:
+        - get_input: data_security_groups
+        port_iox_internal_port_0_network:
+        - internal_net_0
+        port_iox_internal_port_0_replacement_policy:
         - AUTO
         compute_iox_metadata:
         - vf_module_id:
@@ -1279,27 +1284,22 @@ topology_template:
             get_input: vnf_name
           vf_module_name:
             get_input: vf_module_name
-        port_iox_oam_0_port_allowed_address_pairs:
-        - ip_address:
-            get_attribute:
-            - network:io:vip:m004:m003
-            - fixed_ips
-            - 0
-            - ip_address
+        port_iox_data_port_0_name:
+        - str_replace:
+            template: $vnf_name-iox_data_0_port_0
+            params:
+              $vnf_name:
+                get_input: vnf_name
         compute_iox_availability_zone:
         - get_input: availability_zone_0
-        port_iox_oam_0_port_security_groups:
-        - get_input: oam_security_groups
-        port_iox_oam_0_port_mac_requirements:
-          mac_count_required:
-            is_required: false
-        port_iox_oam_0_port_ip_requirements:
-        - ip_version: 4
-          ip_count_required:
-            is_required: false
-          floating_ip_count_required:
-            is_required: false
-        port_iox_data_0_port_network_role_tag: data
+        port_iox_data_port_0_replacement_policy:
+        - AUTO
+        port_iox_oam_port_0_name:
+        - str_replace:
+            template: $vnf_name-iox_oam_0_port_0
+            params:
+              $vnf_name:
+                get_input: vnf_name
         service_template_filter:
           substitute_service_template: Nested_ioxServiceTemplate.yaml
           count: 1
@@ -1309,7 +1309,7 @@ topology_template:
           - service_template_filter
           - index_value
       requirements:
-      - link_iox_iox_internal_0_port:
+      - link_iox_iox_internal_port_0:
           capability: tosca.capabilities.network.Linkable
           node: internal_net_0
           relationship: tosca.relationships.network.LinksTo
@@ -1318,47 +1318,60 @@ topology_template:
       directives:
       - substitutable
       properties:
-        port_app_data_0_port_mac_requirements:
-          mac_count_required:
-            is_required: false
         compute_app_scheduler_hints:
         - group: app_server_group_group
-        port_app_internal_0_port_ip_requirements:
-        - ip_version: 4
-          ip_count_required:
-            is_required: false
-          floating_ip_count_required:
+        port_app_data_port_0_network:
+        - get_input: data_net_id
+        port_app_internal_port_0_mac_requirements:
+          mac_count_required:
             is_required: false
-        port_app_oam_0_port_replacement_policy:
-        - AUTO
-        port_app_oam_0_port_network:
-        - get_input: oam_net_id
         vm_flavor_name:
           get_input: app_flavor_name
-        port_app_data_0_port_fixed_ips:
+        port_app_oam_port_0_security_groups:
+        - get_input: oam_security_groups
+        port_app_internal_port_0_allowed_address_pairs:
         - ip_address:
-            get_input:
-            - app_data_v6_ips
-            - 1
-        vm_image_name:
-          get_input: app_image_name
-        port_app_oam_0_port_name:
+            get_input: internal_subnet_cidr
+        port_app_oam_port_0_network:
+        - get_input: oam_net_id
+        port_app_internal_port_0_name:
         - str_replace:
-            template: $vnf_name-app_oam_1_port_0
+            template: $vnf_name-app_internal_1_port_0
             params:
               $vnf_name:
                 get_input: vnf_name
+        vm_image_name:
+          get_input: app_image_name
         compute_app_availability_zone:
         - get_input: availability_zone_1
         compute_app_config_drive:
         - true
-        port_app_oam_0_port_mac_requirements:
-          mac_count_required:
+        port_app_data_port_0_replacement_policy:
+        - AUTO
+        port_app_oam_port_0_ip_requirements:
+        - ip_version: 4
+          ip_count_required:
+            is_required: true
+          floating_ip_count_required:
             is_required: false
-        port_app_data_0_port_network:
-        - get_input: data_net_id
-        port_app_data_0_port_network_role_tag: data
-        port_app_oam_0_port_network_role_tag: oam
+        port_app_data_port_0_name:
+        - str_replace:
+            template: $vnf_name-app_data_1_port_0
+            params:
+              $vnf_name:
+                get_input: vnf_name
+        port_app_oam_port_0_fixed_ips:
+        - ip_address:
+            get_input:
+            - app_oam_ips
+            - 1
+        port_app_internal_port_0_replacement_policy:
+        - AUTO
+        port_app_data_port_0_fixed_ips:
+        - ip_address:
+            get_input:
+            - app_data_v6_ips
+            - 1
         compute_app_metadata:
         - vf_module_id:
             get_input: vf_module_id
@@ -1369,59 +1382,46 @@ topology_template:
             get_input: vnf_name
           vf_module_name:
             get_input: vf_module_name
-        port_app_data_0_port_ip_requirements:
+        port_app_oam_port_0_mac_requirements:
+          mac_count_required:
+            is_required: false
+        port_app_internal_port_0_security_groups:
+        - get_input: app_security_groups
+        port_app_oam_port_0_replacement_policy:
+        - AUTO
+        port_app_data_port_0_ip_requirements:
         - ip_version: 6
           ip_count_required:
             is_required: true
           floating_ip_count_required:
             is_required: false
-        port_app_internal_0_port_allowed_address_pairs:
-        - ip_address:
-            get_input: internal_subnet_cidr
-        port_app_data_0_port_name:
-        - str_replace:
-            template: $vnf_name-app_data_1_port_0
-            params:
-              $vnf_name:
-                get_input: vnf_name
-        port_app_oam_0_port_ip_requirements:
+        port_app_data_port_0_mac_requirements:
+          mac_count_required:
+            is_required: false
+        port_app_internal_port_0_ip_requirements:
         - ip_version: 4
           ip_count_required:
-            is_required: true
-          floating_ip_count_required:
             is_required: false
-        port_app_internal_0_port_network:
-        - internal_net_0
-        port_app_data_0_port_security_groups:
-        - get_input: data_security_groups
-        port_app_internal_0_port_replacement_policy:
-        - AUTO
-        port_app_internal_0_port_mac_requirements:
-          mac_count_required:
+          floating_ip_count_required:
             is_required: false
-        port_app_oam_0_port_security_groups:
-        - get_input: oam_security_groups
-        port_app_internal_0_port_name:
-        - str_replace:
-            template: $vnf_name-app_internal_1_port_0
-            params:
-              $vnf_name:
-                get_input: vnf_name
-        port_app_oam_0_port_fixed_ips:
-        - ip_address:
-            get_input:
-            - app_oam_ips
-            - 1
-        port_app_data_0_port_replacement_policy:
-        - AUTO
+        port_app_data_port_0_network_role_tag: data
         compute_app_name:
         - get_input:
           - app_names
           - 1
-        port_app_internal_0_port_security_groups:
-        - get_input: app_security_groups
+        port_app_data_port_0_security_groups:
+        - get_input: data_security_groups
+        port_app_internal_port_0_network:
+        - internal_net_0
         compute_app_image_update_policy:
         - REBUILD
+        port_app_oam_port_0_name:
+        - str_replace:
+            template: $vnf_name-app_oam_1_port_0
+            params:
+              $vnf_name:
+                get_input: vnf_name
+        port_app_oam_port_0_network_role_tag: oam
         compute_app_user_data_format:
         - RAW
         service_template_filter:
@@ -1433,7 +1433,7 @@ topology_template:
           - service_template_filter
           - index_value
       requirements:
-      - link_app_app_internal_0_port:
+      - link_app_app_internal_port_0:
           capability: tosca.capabilities.network.Linkable
           node: internal_net_0
           relationship: tosca.relationships.network.LinksTo
@@ -1442,47 +1442,55 @@ topology_template:
       directives:
       - substitutable
       properties:
-        port_app_data_0_port_mac_requirements:
-          mac_count_required:
-            is_required: false
         compute_app_scheduler_hints:
         - group: app_server_group_group
-        port_app_internal_0_port_ip_requirements:
-        - ip_version: 4
-          ip_count_required:
-            is_required: false
-          floating_ip_count_required:
+        port_app_data_port_0_network:
+        - get_input: data_net_id
+        port_app_internal_port_0_mac_requirements:
+          mac_count_required:
             is_required: false
-        port_app_oam_0_port_replacement_policy:
-        - AUTO
-        port_app_oam_0_port_network:
-        - get_input: oam_net_id
         vm_flavor_name:
           get_input: app_flavor_name
-        port_app_data_0_port_fixed_ips:
+        port_app_oam_port_0_security_groups:
+        - get_input: oam_security_groups
+        port_app_internal_port_0_allowed_address_pairs:
         - ip_address:
-            get_input:
-            - app_data_v6_ips
-            - 0
-        vm_image_name:
-          get_input: app_image_name
-        port_app_oam_0_port_name:
+            get_input: internal_subnet_cidr
+        port_app_oam_port_0_network:
+        - get_input: oam_net_id
+        port_app_internal_port_0_name:
         - str_replace:
-            template: $vnf_name-app_oam_0_port_0
+            template: $vnf_name-app_internal_0_port_0
             params:
               $vnf_name:
                 get_input: vnf_name
+        vm_image_name:
+          get_input: app_image_name
         compute_app_availability_zone:
         - get_input: availability_zone_0
         compute_app_config_drive:
         - true
-        port_app_oam_0_port_mac_requirements:
-          mac_count_required:
+        port_app_data_port_0_replacement_policy:
+        - AUTO
+        port_app_oam_port_0_ip_requirements:
+        - ip_version: 4
+          ip_count_required:
             is_required: false
-        port_app_data_0_port_network:
-        - get_input: data_net_id
-        port_app_data_0_port_network_role_tag: data
-        port_app_oam_0_port_network_role_tag: oam
+          floating_ip_count_required:
+            is_required: false
+        port_app_data_port_0_name:
+        - str_replace:
+            template: $vnf_name-app_data_0_port_0
+            params:
+              $vnf_name:
+                get_input: vnf_name
+        port_app_internal_port_0_replacement_policy:
+        - AUTO
+        port_app_data_port_0_fixed_ips:
+        - ip_address:
+            get_input:
+            - app_data_v6_ips
+            - 0
         compute_app_metadata:
         - vf_module_id:
             get_input: vf_module_id
@@ -1493,54 +1501,46 @@ topology_template:
             get_input: vnf_name
           vf_module_name:
             get_input: vf_module_name
-        port_app_data_0_port_ip_requirements:
+        port_app_oam_port_0_mac_requirements:
+          mac_count_required:
+            is_required: false
+        port_app_internal_port_0_security_groups:
+        - get_input: app_security_groups
+        port_app_oam_port_0_replacement_policy:
+        - AUTO
+        port_app_data_port_0_ip_requirements:
         - ip_version: 6
           ip_count_required:
             is_required: true
           floating_ip_count_required:
             is_required: false
-        port_app_internal_0_port_allowed_address_pairs:
-        - ip_address:
-            get_input: internal_subnet_cidr
-        port_app_data_0_port_name:
-        - str_replace:
-            template: $vnf_name-app_data_0_port_0
-            params:
-              $vnf_name:
-                get_input: vnf_name
-        port_app_oam_0_port_ip_requirements:
+        port_app_data_port_0_mac_requirements:
+          mac_count_required:
+            is_required: false
+        port_app_internal_port_0_ip_requirements:
         - ip_version: 4
           ip_count_required:
             is_required: false
           floating_ip_count_required:
             is_required: false
-        port_app_internal_0_port_network:
-        - internal_net_0
-        port_app_data_0_port_security_groups:
-        - get_input: data_security_groups
-        port_app_internal_0_port_replacement_policy:
-        - AUTO
-        port_app_internal_0_port_mac_requirements:
-          mac_count_required:
-            is_required: false
-        port_app_oam_0_port_security_groups:
-        - get_input: oam_security_groups
-        port_app_internal_0_port_name:
-        - str_replace:
-            template: $vnf_name-app_internal_0_port_0
-            params:
-              $vnf_name:
-                get_input: vnf_name
-        port_app_data_0_port_replacement_policy:
-        - AUTO
+        port_app_data_port_0_network_role_tag: data
         compute_app_name:
         - get_input:
           - app_names
           - 0
-        port_app_internal_0_port_security_groups:
-        - get_input: app_security_groups
+        port_app_data_port_0_security_groups:
+        - get_input: data_security_groups
+        port_app_internal_port_0_network:
+        - internal_net_0
         compute_app_image_update_policy:
         - REBUILD
+        port_app_oam_port_0_name:
+        - str_replace:
+            template: $vnf_name-app_oam_0_port_0
+            params:
+              $vnf_name:
+                get_input: vnf_name
+        port_app_oam_port_0_network_role_tag: oam
         compute_app_user_data_format:
         - RAW
         service_template_filter:
@@ -1552,7 +1552,7 @@ topology_template:
           - service_template_filter
           - index_value
       requirements:
-      - link_app_app_internal_0_port:
+      - link_app_app_internal_port_0:
           capability: tosca.capabilities.network.Linkable
           node: internal_net_0
           relationship: tosca.relationships.network.LinksTo
@@ -1583,56 +1583,61 @@ topology_template:
       directives:
       - substitutable
       properties:
-        port_plt_internal_0_port_allowed_address_pairs:
+        port_plt_oam_port_0_network_role_tag: oam
+        port_plt_data_port_0_allowed_address_pairs:
         - ip_address:
-            get_input: internal_subnet_cidr
-        port_plt_oam_0_port_security_groups:
-        - get_input: oam_security_groups
+            get_attribute:
+            - network:data:vip:m001:m002
+            - fixed_ips
+            - 0
+            - ip_address
+        port_plt_oam_port_0_ip_requirements:
+        - ip_version: 4
+          ip_count_required:
+            is_required: false
+          floating_ip_count_required:
+            is_required: false
         compute_plt_config_drive:
         - true
+        port_plt_data_port_0_network_role_tag: data
         vm_flavor_name:
           get_input: plt_flavor_name
-        port_plt_data_0_port_fixed_ips:
-        - ip_address:
-            get_input:
-            - plt_data_v6_ips
-            - 1
+        port_plt_internal_port_0_replacement_policy:
+        - AUTO
+        port_plt_data_port_0_security_groups:
+        - get_input: data_security_groups
         vm_image_name:
           get_input: plt_image_name
-        compute_plt_availability_zone:
-        - get_input: availability_zone_1
-        port_plt_oam_0_port_name:
+        port_plt_oam_port_0_name:
         - str_replace:
             template: $vnf_name-plt_oam_0_port_0
             params:
               $vnf_name:
                 get_input: vnf_name
-        port_plt_internal_0_port_security_groups:
-        - get_input: plt_security_groups
-        port_plt_oam_0_port_ip_requirements:
-        - ip_version: 4
+        compute_plt_availability_zone:
+        - get_input: availability_zone_1
+        port_plt_data_port_0_ip_requirements:
+        - ip_version: 6
           ip_count_required:
-            is_required: false
+            is_required: true
           floating_ip_count_required:
             is_required: false
-        port_plt_data_0_port_mac_requirements:
+        port_plt_data_port_0_replacement_policy:
+        - AUTO
+        port_plt_oam_port_0_security_groups:
+        - get_input: oam_security_groups
+        port_plt_oam_port_0_mac_requirements:
           mac_count_required:
             is_required: false
-        port_plt_data_0_port_allowed_address_pairs:
+        port_plt_internal_port_0_allowed_address_pairs:
         - ip_address:
-            get_attribute:
-            - network:data:vip:m001:m002
-            - fixed_ips
-            - 0
-            - ip_address
-        port_plt_data_0_port_ip_requirements:
-        - ip_version: 6
+            get_input: internal_subnet_cidr
+        port_plt_internal_port_0_ip_requirements:
+        - ip_version: 4
           ip_count_required:
-            is_required: true
+            is_required: false
           floating_ip_count_required:
             is_required: false
-        port_plt_internal_0_port_network:
-        - internal_net_0
         compute_plt_metadata:
         - vf_module_id:
             get_input: vf_module_id
@@ -1643,59 +1648,54 @@ topology_template:
             get_input: vnf_name
           vf_module_name:
             get_input: vf_module_name
-        port_plt_data_0_port_security_groups:
-        - get_input: data_security_groups
-        port_plt_internal_0_port_mac_requirements:
+        port_plt_internal_port_0_security_groups:
+        - get_input: plt_security_groups
+        port_plt_oam_port_0_network:
+        - get_input: oam_net_id
+        port_plt_oam_port_0_replacement_policy:
+        - AUTO
+        port_plt_internal_port_0_mac_requirements:
           mac_count_required:
             is_required: false
-        port_plt_data_0_port_network_role_tag: data
-        port_plt_internal_0_port_ip_requirements:
-        - ip_version: 4
-          ip_count_required:
-            is_required: false
-          floating_ip_count_required:
+        compute_plt_image_update_policy:
+        - REBUILD
+        compute_plt_user_data_format:
+        - RAW
+        port_plt_internal_port_0_network:
+        - internal_net_0
+        port_plt_data_port_0_fixed_ips:
+        - ip_address:
+            get_input:
+            - plt_data_v6_ips
+            - 1
+        port_plt_data_port_0_mac_requirements:
+          mac_count_required:
             is_required: false
-        port_plt_oam_0_port_network_role_tag: oam
-        port_plt_internal_0_port_name:
+        port_plt_internal_port_0_name:
         - str_replace:
             template: $vnf_name-plt_internal_0_port_0
             params:
               $vnf_name:
                 get_input: vnf_name
-        compute_plt_image_update_policy:
-        - REBUILD
-        port_plt_oam_0_port_allowed_address_pairs:
-        - ip_address:
-            get_attribute:
-            - network:oam:vip:m001:m002
-            - fixed_ips
-            - 0
-            - ip_address
-        port_plt_data_0_port_name:
+        compute_plt_name:
+        - get_input:
+          - plt_names
+          - 1
+        port_plt_data_port_0_name:
         - str_replace:
             template: $vnf_name-plt_data_0_port_0
             params:
               $vnf_name:
                 get_input: vnf_name
-        compute_plt_user_data_format:
-        - RAW
-        port_plt_internal_0_port_replacement_policy:
-        - AUTO
-        port_plt_data_0_port_network:
+        port_plt_data_port_0_network:
         - get_input: data_net_id
-        port_plt_oam_0_port_network:
-        - get_input: oam_net_id
-        port_plt_oam_0_port_replacement_policy:
-        - AUTO
-        port_plt_data_0_port_replacement_policy:
-        - AUTO
-        port_plt_oam_0_port_mac_requirements:
-          mac_count_required:
-            is_required: false
-        compute_plt_name:
-        - get_input:
-          - plt_names
-          - 1
+        port_plt_oam_port_0_allowed_address_pairs:
+        - ip_address:
+            get_attribute:
+            - network:oam:vip:m001:m002
+            - fixed_ips
+            - 0
+            - ip_address
         service_template_filter:
           substitute_service_template: Nested_pltServiceTemplate.yaml
           count: 1
@@ -1705,7 +1705,7 @@ topology_template:
           - service_template_filter
           - index_value
       requirements:
-      - link_plt_plt_internal_0_port:
+      - link_plt_plt_internal_port_0:
           capability: tosca.capabilities.network.Linkable
           node: internal_net_0
           relationship: tosca.relationships.network.LinksTo
@@ -1714,56 +1714,61 @@ topology_template:
       directives:
       - substitutable
       properties:
-        port_plt_internal_0_port_allowed_address_pairs:
+        port_plt_oam_port_0_network_role_tag: oam
+        port_plt_data_port_0_allowed_address_pairs:
         - ip_address:
-            get_input: internal_subnet_cidr
-        port_plt_oam_0_port_security_groups:
-        - get_input: oam_security_groups
+            get_attribute:
+            - network:data:vip:m001:m002
+            - fixed_ips
+            - 0
+            - ip_address
+        port_plt_oam_port_0_ip_requirements:
+        - ip_version: 4
+          ip_count_required:
+            is_required: true
+          floating_ip_count_required:
+            is_required: false
         compute_plt_config_drive:
         - true
+        port_plt_data_port_0_network_role_tag: data
         vm_flavor_name:
           get_input: plt_flavor_name
-        port_plt_data_0_port_fixed_ips:
-        - ip_address:
-            get_input:
-            - plt_data_v6_ips
-            - 0
+        port_plt_internal_port_0_replacement_policy:
+        - AUTO
+        port_plt_data_port_0_security_groups:
+        - get_input: data_security_groups
         vm_image_name:
           get_input: plt_image_name
-        compute_plt_availability_zone:
-        - get_input: availability_zone_0
-        port_plt_oam_0_port_name:
+        port_plt_oam_port_0_name:
         - str_replace:
             template: $vnf_name-plt_oam_0_port_0
             params:
               $vnf_name:
                 get_input: vnf_name
-        port_plt_internal_0_port_security_groups:
-        - get_input: plt_security_groups
-        port_plt_oam_0_port_ip_requirements:
-        - ip_version: 4
+        compute_plt_availability_zone:
+        - get_input: availability_zone_0
+        port_plt_data_port_0_ip_requirements:
+        - ip_version: 6
           ip_count_required:
             is_required: true
           floating_ip_count_required:
             is_required: false
-        port_plt_data_0_port_mac_requirements:
+        port_plt_data_port_0_replacement_policy:
+        - AUTO
+        port_plt_oam_port_0_security_groups:
+        - get_input: oam_security_groups
+        port_plt_oam_port_0_mac_requirements:
           mac_count_required:
             is_required: false
-        port_plt_data_0_port_allowed_address_pairs:
+        port_plt_internal_port_0_allowed_address_pairs:
         - ip_address:
-            get_attribute:
-            - network:data:vip:m001:m002
-            - fixed_ips
-            - 0
-            - ip_address
-        port_plt_data_0_port_ip_requirements:
-        - ip_version: 6
+            get_input: internal_subnet_cidr
+        port_plt_internal_port_0_ip_requirements:
+        - ip_version: 4
           ip_count_required:
-            is_required: true
+            is_required: false
           floating_ip_count_required:
             is_required: false
-        port_plt_internal_0_port_network:
-        - internal_net_0
         compute_plt_metadata:
         - vf_module_id:
             get_input: vf_module_id
@@ -1774,64 +1779,59 @@ topology_template:
             get_input: vnf_name
           vf_module_name:
             get_input: vf_module_name
-        port_plt_data_0_port_security_groups:
-        - get_input: data_security_groups
-        port_plt_internal_0_port_mac_requirements:
-          mac_count_required:
-            is_required: false
-        port_plt_data_0_port_network_role_tag: data
-        port_plt_internal_0_port_ip_requirements:
-        - ip_version: 4
-          ip_count_required:
-            is_required: false
-          floating_ip_count_required:
-            is_required: false
-        port_plt_oam_0_port_fixed_ips:
+        port_plt_oam_port_0_fixed_ips:
         - ip_address:
             get_input:
             - plt_oam_ips
             - 0
-        port_plt_oam_0_port_network_role_tag: oam
-        port_plt_internal_0_port_name:
-        - str_replace:
-            template: $vnf_name-plt_internal_0_port_0
-            params:
-              $vnf_name:
-                get_input: vnf_name
+        port_plt_internal_port_0_security_groups:
+        - get_input: plt_security_groups
+        port_plt_oam_port_0_network:
+        - get_input: oam_net_id
+        port_plt_oam_port_0_replacement_policy:
+        - AUTO
+        port_plt_internal_port_0_mac_requirements:
+          mac_count_required:
+            is_required: false
         compute_plt_image_update_policy:
         - REBUILD
-        port_plt_oam_0_port_allowed_address_pairs:
+        compute_plt_user_data_format:
+        - RAW
+        port_plt_internal_port_0_network:
+        - internal_net_0
+        port_plt_data_port_0_fixed_ips:
         - ip_address:
-            get_attribute:
-            - network:oam:vip:m001:m002
-            - fixed_ips
+            get_input:
+            - plt_data_v6_ips
             - 0
-            - ip_address
-        port_plt_data_0_port_name:
+        port_plt_data_port_0_mac_requirements:
+          mac_count_required:
+            is_required: false
+        port_plt_internal_port_0_name:
         - str_replace:
-            template: $vnf_name-plt_data_0_port_0
+            template: $vnf_name-plt_internal_0_port_0
             params:
               $vnf_name:
                 get_input: vnf_name
-        compute_plt_user_data_format:
-        - RAW
-        port_plt_internal_0_port_replacement_policy:
-        - AUTO
-        port_plt_data_0_port_network:
-        - get_input: data_net_id
-        port_plt_oam_0_port_network:
-        - get_input: oam_net_id
-        port_plt_oam_0_port_replacement_policy:
-        - AUTO
-        port_plt_data_0_port_replacement_policy:
-        - AUTO
-        port_plt_oam_0_port_mac_requirements:
-          mac_count_required:
-            is_required: false
         compute_plt_name:
         - get_input:
           - plt_names
           - 0
+        port_plt_data_port_0_name:
+        - str_replace:
+            template: $vnf_name-plt_data_0_port_0
+            params:
+              $vnf_name:
+                get_input: vnf_name
+        port_plt_data_port_0_network:
+        - get_input: data_net_id
+        port_plt_oam_port_0_allowed_address_pairs:
+        - ip_address:
+            get_attribute:
+            - network:oam:vip:m001:m002
+            - fixed_ips
+            - 0
+            - ip_address
         service_template_filter:
           substitute_service_template: Nested_pltServiceTemplate.yaml
           count: 1
@@ -1841,7 +1841,7 @@ topology_template:
           - service_template_filter
           - index_value
       requirements:
-      - link_plt_plt_internal_0_port:
+      - link_plt_plt_internal_port_0:
           capability: tosca.capabilities.network.Linkable
           node: internal_net_0
           relationship: tosca.relationships.network.LinksTo
@@ -1943,4 +1943,4 @@ topology_template:
                 get_input: vnf_name
         container_type: host
       targets:
-      - app_server_group_group
+      - app_server_group_group
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_appServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_appServiceTemplate.yaml
index 081b35ad6d..a6bb612c4a 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_appServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_appServiceTemplate.yaml
@@ -11,48 +11,48 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
-    port_app_data_0_port_mac_requirements:
-      type: org.openecomp.datatypes.network.MacRequirements
-      required: true
     compute_app_scheduler_hints:
       type: list
       required: true
       entry_schema:
         type: json
-    port_app_internal_0_port_ip_requirements:
+    port_app_data_port_0_network:
       type: list
       required: true
       entry_schema:
-        type: org.openecomp.datatypes.network.IpRequirements
-    port_app_data_0_port_network_role:
+        type: string
+    port_app_internal_port_0_mac_requirements:
+      type: org.openecomp.datatypes.network.MacRequirements
+      required: true
+    vm_flavor_name:
       type: string
       required: true
-    port_app_oam_0_port_replacement_policy:
+    port_app_oam_port_0_security_groups:
       type: list
       required: true
       entry_schema:
-        type: string
-    port_app_oam_0_port_network:
+        type: json
+    port_app_internal_port_0_allowed_address_pairs:
       type: list
       required: true
       entry_schema:
-        type: string
-    vm_flavor_name:
-      type: string
+        type: org.openecomp.datatypes.heat.network.AddressPair
+    port_app_oam_port_0_network:
+      type: list
       required: true
-    port_app_data_0_port_fixed_ips:
+      entry_schema:
+        type: string
+    port_app_internal_port_0_name:
       type: list
       required: true
       entry_schema:
-        type: org.openecomp.datatypes.heat.neutron.port.FixedIps
+        type: string
     vm_image_name:
       type: string
       required: true
-    port_app_oam_0_port_name:
-      type: list
+    port_app_internal_port_0_network_role:
+      type: string
       required: true
-      entry_schema:
-        type: string
     compute_app_availability_zone:
       type: list
       required: true
@@ -63,134 +63,106 @@ topology_template:
       required: true
       entry_schema:
         type: boolean
-    port_app_oam_0_port_mac_requirements:
-      type: org.openecomp.datatypes.network.MacRequirements
-      required: true
-    port_app_data_0_port_network:
+    port_app_data_port_0_replacement_policy:
       type: list
       required: true
       entry_schema:
         type: string
-    port_app_data_0_port_network_role_tag:
-      type: string
-      required: true
-    port_app_oam_0_port_network_role_tag:
-      type: string
-      required: true
-    port_app_data_0_port_exCP_naming:
-      type: org.openecomp.datatypes.Naming
-      required: true
-    port_app_data_0_port_vlan_requirements:
+    port_app_oam_port_0_ip_requirements:
       type: list
       required: true
       entry_schema:
-        type: org.openecomp.datatypes.network.VlanRequirements
-    port_app_internal_0_port_network_role_tag:
-      type: string
-      required: true
-    port_app_internal_0_port_related_networks:
+        type: org.openecomp.datatypes.network.IpRequirements
+    port_app_data_port_0_name:
       type: list
       required: true
       entry_schema:
-        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
-    port_app_oam_0_port_network_role:
-      type: string
+        type: string
+    port_app_oam_port_0_order:
+      type: integer
       required: true
-    compute_app_metadata:
+    port_app_oam_port_0_fixed_ips:
       type: list
       required: true
       entry_schema:
-        type: json
-    port_app_data_0_port_related_networks:
+        type: org.openecomp.datatypes.heat.neutron.port.FixedIps
+    port_app_internal_port_0_replacement_policy:
       type: list
       required: true
       entry_schema:
-        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
-    port_app_data_0_port_ip_requirements:
+        type: string
+    port_app_data_port_0_fixed_ips:
       type: list
       required: true
       entry_schema:
-        type: org.openecomp.datatypes.network.IpRequirements
-    port_app_internal_0_port_network_role:
-      type: string
-      required: true
-    port_app_internal_0_port_subnetpoolid:
-      type: string
-      required: true
-    port_app_internal_0_port_allowed_address_pairs:
+        type: org.openecomp.datatypes.heat.neutron.port.FixedIps
+    port_app_data_port_0_vlan_requirements:
       type: list
       required: true
       entry_schema:
-        type: org.openecomp.datatypes.heat.network.AddressPair
-    port_app_oam_0_port_related_networks:
+        type: org.openecomp.datatypes.network.VlanRequirements
+    port_app_data_port_0_exCP_naming:
+      type: org.openecomp.datatypes.Naming
+      required: true
+    compute_app_metadata:
       type: list
       required: true
       entry_schema:
-        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
-    port_app_data_0_port_subnetpoolid:
-      type: string
-      required: true
-    port_app_oam_0_port_subnetpoolid:
-      type: string
+        type: json
+    port_app_oam_port_0_mac_requirements:
+      type: org.openecomp.datatypes.network.MacRequirements
       required: true
-    port_app_internal_0_port_order:
+    port_app_internal_port_0_order:
       type: integer
       required: true
-    port_app_internal_0_port_exCP_naming:
+    port_app_oam_port_0_exCP_naming:
       type: org.openecomp.datatypes.Naming
       required: true
-    port_app_data_0_port_name:
+    port_app_internal_port_0_security_groups:
       type: list
       required: true
       entry_schema:
-        type: string
-    port_app_oam_0_port_ip_requirements:
-      type: list
+        type: json
+    port_app_oam_port_0_network_role:
+      type: string
       required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.IpRequirements
-    port_app_oam_0_port_exCP_naming:
-      type: org.openecomp.datatypes.Naming
+    port_app_internal_port_0_subnetpoolid:
+      type: string
       required: true
-    port_app_internal_0_port_network:
-      type: list
+    port_app_data_port_0_network_role:
+      type: string
       required: true
-      entry_schema:
-        type: string
-    port_app_data_0_port_security_groups:
+    port_app_internal_port_0_vlan_requirements:
       type: list
       required: true
       entry_schema:
-        type: json
-    port_app_oam_0_port_order:
-      type: integer
-      required: true
-    port_app_internal_0_port_vlan_requirements:
+        type: org.openecomp.datatypes.network.VlanRequirements
+    port_app_oam_port_0_replacement_policy:
       type: list
       required: true
       entry_schema:
-        type: org.openecomp.datatypes.network.VlanRequirements
-    port_app_internal_0_port_replacement_policy:
+        type: string
+    port_app_data_port_0_ip_requirements:
       type: list
       required: true
       entry_schema:
-        type: string
-    port_app_internal_0_port_mac_requirements:
+        type: org.openecomp.datatypes.network.IpRequirements
+    port_app_data_port_0_mac_requirements:
       type: org.openecomp.datatypes.network.MacRequirements
       required: true
-    port_app_data_0_port_order:
-      type: integer
-      required: true
-    port_app_oam_0_port_security_groups:
+    port_app_data_port_0_related_networks:
       type: list
       required: true
       entry_schema:
-        type: json
-    port_app_internal_0_port_name:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+    port_app_internal_port_0_ip_requirements:
       type: list
       required: true
       entry_schema:
-        type: string
+        type: org.openecomp.datatypes.network.IpRequirements
+    port_app_data_port_0_network_role_tag:
+      type: string
+      required: true
     index_value:
       type: integer
       description: Index value of this substitution service template runtime instance
@@ -198,41 +170,69 @@ topology_template:
       default: 0
       constraints:
       - greater_or_equal: 0
-    port_app_oam_0_port_fixed_ips:
+    compute_app_name:
       type: list
       required: true
       entry_schema:
-        type: org.openecomp.datatypes.heat.neutron.port.FixedIps
-    port_app_data_0_port_replacement_policy:
+        type: string
+    port_app_oam_port_0_related_networks:
       type: list
       required: true
       entry_schema:
-        type: string
-    compute_app_name:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+    port_app_data_port_0_security_groups:
       type: list
       required: true
       entry_schema:
-        type: string
-    port_app_oam_0_port_vlan_requirements:
+        type: json
+    port_app_oam_port_0_vlan_requirements:
       type: list
       required: true
       entry_schema:
         type: org.openecomp.datatypes.network.VlanRequirements
-    port_app_internal_0_port_security_groups:
+    port_app_oam_port_0_subnetpoolid:
+      type: string
+      required: true
+    port_app_data_port_0_order:
+      type: integer
+      required: true
+    port_app_data_port_0_subnetpoolid:
+      type: string
+      required: true
+    port_app_internal_port_0_network:
       type: list
       required: true
       entry_schema:
-        type: json
+        type: string
     compute_app_image_update_policy:
       type: list
       required: true
       entry_schema:
         type: string
+    port_app_internal_port_0_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+    port_app_oam_port_0_name:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_app_oam_port_0_network_role_tag:
+      type: string
+      required: true
     compute_app_user_data_format:
       type: list
       required: true
       entry_schema:
         type: string
+    port_app_internal_port_0_network_role_tag:
+      type: string
+      required: true
+    port_app_internal_port_0_exCP_naming:
+      type: org.openecomp.datatypes.Naming
+      required: true
   node_templates:
     app:
       type: org.openecomp.resource.vfc.compute.nodes.heat.app
@@ -269,139 +269,139 @@ topology_template:
           get_input:
           - compute_app_user_data_format
           - index_value
-    app_app_internal_0_port:
+    app_app_data_port_0:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         replacement_policy:
           get_input:
-          - port_app_internal_0_port_replacement_policy
+          - port_app_data_port_0_replacement_policy
           - index_value
         mac_requirements:
-          get_input: port_app_internal_0_port_mac_requirements
-        allowed_address_pairs:
-          get_input: port_app_internal_0_port_allowed_address_pairs
+          get_input: port_app_data_port_0_mac_requirements
         order:
-          get_input: port_app_internal_0_port_order
+          get_input: port_app_data_port_0_order
         security_groups:
           get_input:
-          - port_app_internal_0_port_security_groups
+          - port_app_data_port_0_security_groups
           - index_value
         exCP_naming:
-          get_input: port_app_internal_0_port_exCP_naming
+          get_input: port_app_data_port_0_exCP_naming
         vlan_requirements:
-          get_input: port_app_internal_0_port_vlan_requirements
+          get_input: port_app_data_port_0_vlan_requirements
         subinterface_indicator: false
         related_networks:
-          get_input: port_app_internal_0_port_related_networks
+          get_input: port_app_data_port_0_related_networks
         ip_requirements:
-          get_input: port_app_internal_0_port_ip_requirements
+          get_input: port_app_data_port_0_ip_requirements
         network_role_tag:
-          get_input: port_app_internal_0_port_network_role_tag
+          get_input: port_app_data_port_0_network_role_tag
         network_role:
-          get_input: port_app_internal_0_port_network_role
+          get_input: port_app_data_port_0_network_role
         subnetpoolid:
-          get_input: port_app_internal_0_port_subnetpoolid
+          get_input: port_app_data_port_0_subnetpoolid
+        fixed_ips:
+          get_input:
+          - port_app_data_port_0_fixed_ips
+          - index_value
         name:
           get_input:
-          - port_app_internal_0_port_name
+          - port_app_data_port_0_name
           - index_value
         network:
           get_input:
-          - port_app_internal_0_port_network
+          - port_app_data_port_0_network
           - index_value
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
           node: app
           relationship: tosca.relationships.network.BindsTo
-    app_app_oam_0_port:
+    app_app_internal_port_0:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         replacement_policy:
           get_input:
-          - port_app_oam_0_port_replacement_policy
+          - port_app_internal_port_0_replacement_policy
           - index_value
         mac_requirements:
-          get_input: port_app_oam_0_port_mac_requirements
+          get_input: port_app_internal_port_0_mac_requirements
+        allowed_address_pairs:
+          get_input: port_app_internal_port_0_allowed_address_pairs
         order:
-          get_input: port_app_oam_0_port_order
+          get_input: port_app_internal_port_0_order
         security_groups:
           get_input:
-          - port_app_oam_0_port_security_groups
+          - port_app_internal_port_0_security_groups
           - index_value
         exCP_naming:
-          get_input: port_app_oam_0_port_exCP_naming
+          get_input: port_app_internal_port_0_exCP_naming
         vlan_requirements:
-          get_input: port_app_oam_0_port_vlan_requirements
+          get_input: port_app_internal_port_0_vlan_requirements
         subinterface_indicator: false
         related_networks:
-          get_input: port_app_oam_0_port_related_networks
+          get_input: port_app_internal_port_0_related_networks
         ip_requirements:
-          get_input: port_app_oam_0_port_ip_requirements
+          get_input: port_app_internal_port_0_ip_requirements
         network_role_tag:
-          get_input: port_app_oam_0_port_network_role_tag
+          get_input: port_app_internal_port_0_network_role_tag
         network_role:
-          get_input: port_app_oam_0_port_network_role
+          get_input: port_app_internal_port_0_network_role
         subnetpoolid:
-          get_input: port_app_oam_0_port_subnetpoolid
-        fixed_ips:
-          get_input:
-          - port_app_oam_0_port_fixed_ips
-          - index_value
+          get_input: port_app_internal_port_0_subnetpoolid
         name:
           get_input:
-          - port_app_oam_0_port_name
+          - port_app_internal_port_0_name
           - index_value
         network:
           get_input:
-          - port_app_oam_0_port_network
+          - port_app_internal_port_0_network
           - index_value
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
           node: app
           relationship: tosca.relationships.network.BindsTo
-    app_app_data_0_port:
+    app_app_oam_port_0:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         replacement_policy:
           get_input:
-          - port_app_data_0_port_replacement_policy
+          - port_app_oam_port_0_replacement_policy
           - index_value
         mac_requirements:
-          get_input: port_app_data_0_port_mac_requirements
+          get_input: port_app_oam_port_0_mac_requirements
         order:
-          get_input: port_app_data_0_port_order
+          get_input: port_app_oam_port_0_order
         security_groups:
           get_input:
-          - port_app_data_0_port_security_groups
+          - port_app_oam_port_0_security_groups
           - index_value
         exCP_naming:
-          get_input: port_app_data_0_port_exCP_naming
+          get_input: port_app_oam_port_0_exCP_naming
         vlan_requirements:
-          get_input: port_app_data_0_port_vlan_requirements
+          get_input: port_app_oam_port_0_vlan_requirements
         subinterface_indicator: false
         related_networks:
-          get_input: port_app_data_0_port_related_networks
+          get_input: port_app_oam_port_0_related_networks
         ip_requirements:
-          get_input: port_app_data_0_port_ip_requirements
+          get_input: port_app_oam_port_0_ip_requirements
         network_role_tag:
-          get_input: port_app_data_0_port_network_role_tag
+          get_input: port_app_oam_port_0_network_role_tag
         network_role:
-          get_input: port_app_data_0_port_network_role
+          get_input: port_app_oam_port_0_network_role
         subnetpoolid:
-          get_input: port_app_data_0_port_subnetpoolid
+          get_input: port_app_oam_port_0_subnetpoolid
         fixed_ips:
           get_input:
-          - port_app_data_0_port_fixed_ips
+          - port_app_oam_port_0_fixed_ips
           - index_value
         name:
           get_input:
-          - port_app_data_0_port_name
+          - port_app_oam_port_0_name
           - index_value
         network:
           get_input:
-          - port_app_data_0_port_network
+          - port_app_oam_port_0_network
           - index_value
       requirements:
       - binding:
@@ -414,9 +414,9 @@ topology_template:
       disk.device.write.requests_app:
       - app
       - disk.device.write.requests
-      feature_app_app_oam_0_port:
-      - app_app_oam_0_port
-      - feature
+      network.incoming.bytes_app_app_data_port_0:
+      - app_app_data_port_0
+      - network.incoming.bytes
       disk.device.capacity_app:
       - app
       - disk.device.capacity
@@ -426,18 +426,12 @@ topology_template:
       disk.device.iops_app:
       - app
       - disk.device.iops
-      network.incoming.packets.rate_app_app_oam_0_port:
-      - app_app_oam_0_port
-      - network.incoming.packets.rate
-      network.incoming.bytes.rate_app_app_data_0_port:
-      - app_app_data_0_port
-      - network.incoming.bytes.rate
-      network.incoming.bytes_app_app_oam_0_port:
-      - app_app_oam_0_port
-      - network.incoming.bytes
-      network.incoming.packets.rate_app_app_internal_0_port:
-      - app_app_internal_0_port
-      - network.incoming.packets.rate
+      network.outpoing.packets_app_app_internal_port_0:
+      - app_app_internal_port_0
+      - network.outpoing.packets
+      network.outgoing.bytes.rate_app_app_data_port_0:
+      - app_app_data_port_0
+      - network.outgoing.bytes.rate
       cpu.delta_app:
       - app
       - cpu.delta
@@ -453,45 +447,60 @@ topology_template:
       disk.device.latency_app:
       - app
       - disk.device.latency
-      forwarder_app_app_oam_0_port:
-      - app_app_oam_0_port
-      - forwarder
+      network.outgoing.packets.rate_app_app_oam_port_0:
+      - app_app_oam_port_0
+      - network.outgoing.packets.rate
+      network.incoming.packets_app_app_internal_port_0:
+      - app_app_internal_port_0
+      - network.incoming.packets
       disk.ephemeral.size_app:
       - app
       - disk.ephemeral.size
-      network.outgoing.bytes_app_app_oam_0_port:
-      - app_app_oam_0_port
-      - network.outgoing.bytes
+      network.incoming.bytes.rate_app_app_oam_port_0:
+      - app_app_oam_port_0
+      - network.incoming.bytes.rate
       disk.device.write.requests.rate_app:
       - app
       - disk.device.write.requests.rate
       disk.device.read.bytes_app:
       - app
       - disk.device.read.bytes
-      binding_app_app_data_0_port:
-      - app_app_data_0_port
-      - binding
+      network.outgoing.bytes_app_app_internal_port_0:
+      - app_app_internal_port_0
+      - network.outgoing.bytes
       disk.device.read.requests.rate_app:
       - app
       - disk.device.read.requests.rate
+      network.outgoing.bytes.rate_app_app_oam_port_0:
+      - app_app_oam_port_0
+      - network.outgoing.bytes.rate
+      network.incoming.bytes.rate_app_app_data_port_0:
+      - app_app_data_port_0
+      - network.incoming.bytes.rate
+      network.outgoing.bytes_app_app_oam_port_0:
+      - app_app_oam_port_0
+      - network.outgoing.bytes
       vcpus_app:
       - app
       - vcpus
+      binding_app_app_internal_port_0:
+      - app_app_internal_port_0
+      - binding
       disk.device.read.requests_app:
       - app
       - disk.device.read.requests
-      feature_app_app_internal_0_port:
-      - app_app_internal_0_port
-      - feature
       cpu_util_app:
       - app
       - cpu_util
+      attachment_app_app_internal_port_0:
+      - app_app_internal_port_0
+      - attachment
       endpoint_app:
       - app
       - endpoint
-      network.incoming.packets.rate_app_app_data_0_port:
-      - app_app_data_0_port
-      - network.incoming.packets.rate
+      network.incoming.bytes.rate_app_app_internal_port_0:
+      - app_app_internal_port_0
+      - network.incoming.bytes.rate
       disk.iops_app:
       - app
       - disk.iops
@@ -501,81 +510,57 @@ topology_template:
       disk.read.bytes.rate_app:
       - app
       - disk.read.bytes.rate
+      attachment_app_app_data_port_0:
+      - app_app_data_port_0
+      - attachment
       disk.latency_app:
       - app
       - disk.latency
       memory.usage_app:
       - app
       - memory.usage
-      attachment_app_app_oam_0_port:
-      - app_app_oam_0_port
-      - attachment
       os_app:
       - app
       - os
-      network.incoming.packets_app_app_internal_0_port:
-      - app_app_internal_0_port
-      - network.incoming.packets
-      network.incoming.packets_app_app_oam_0_port:
-      - app_app_oam_0_port
-      - network.incoming.packets
-      network.outgoing.bytes.rate_app_app_internal_0_port:
-      - app_app_internal_0_port
-      - network.outgoing.bytes.rate
-      network.outgoing.bytes.rate_app_app_oam_0_port:
-      - app_app_oam_0_port
-      - network.outgoing.bytes.rate
-      forwarder_app_app_internal_0_port:
-      - app_app_internal_0_port
-      - forwarder
+      network.outgoing.bytes_app_app_data_port_0:
+      - app_app_data_port_0
+      - network.outgoing.bytes
+      feature_app_app_oam_port_0:
+      - app_app_oam_port_0
+      - feature
       memory_app:
       - app
       - memory
       disk.read.requests_app:
       - app
       - disk.read.requests
-      network.outpoing.packets_app_app_oam_0_port:
-      - app_app_oam_0_port
-      - network.outpoing.packets
-      network.incoming.bytes_app_app_data_0_port:
-      - app_app_data_0_port
-      - network.incoming.bytes
+      forwarder_app_app_oam_port_0:
+      - app_app_oam_port_0
+      - forwarder
       disk.write.bytes_app:
       - app
       - disk.write.bytes
+      binding_app_app_data_port_0:
+      - app_app_data_port_0
+      - binding
       disk.allocation_app:
       - app
       - disk.allocation
-      network.outgoing.bytes_app_app_internal_0_port:
-      - app_app_internal_0_port
-      - network.outgoing.bytes
-      attachment_app_app_data_0_port:
-      - app_app_data_0_port
-      - attachment
-      network.incoming.bytes.rate_app_app_oam_0_port:
-      - app_app_oam_0_port
-      - network.incoming.bytes.rate
-      network.outgoing.packets.rate_app_app_internal_0_port:
-      - app_app_internal_0_port
-      - network.outgoing.packets.rate
-      network.incoming.bytes.rate_app_app_internal_0_port:
-      - app_app_internal_0_port
-      - network.incoming.bytes.rate
+      network.incoming.packets_app_app_data_port_0:
+      - app_app_data_port_0
+      - network.incoming.packets
       memory.resident_app:
       - app
       - memory.resident
-      network.outgoing.packets.rate_app_app_oam_0_port:
-      - app_app_oam_0_port
-      - network.outgoing.packets.rate
-      network.outgoing.bytes.rate_app_app_data_0_port:
-      - app_app_data_0_port
-      - network.outgoing.bytes.rate
+      binding_app_app_oam_port_0:
+      - app_app_oam_port_0
+      - binding
+      feature_app_app_internal_port_0:
+      - app_app_internal_port_0
+      - feature
       cpu_app:
       - app
       - cpu
-      feature_app_app_data_0_port:
-      - app_app_data_0_port
-      - feature
       disk.usage_app:
       - app
       - disk.usage
@@ -585,85 +570,100 @@ topology_template:
       disk.read.bytes_app:
       - app
       - disk.read.bytes
+      network.outpoing.packets_app_app_data_port_0:
+      - app_app_data_port_0
+      - network.outpoing.packets
+      network.incoming.bytes_app_app_oam_port_0:
+      - app_app_oam_port_0
+      - network.incoming.bytes
       scalable_app:
       - app
       - scalable
-      network.outgoing.packets.rate_app_app_data_0_port:
-      - app_app_data_0_port
-      - network.outgoing.packets.rate
+      network.incoming.bytes_app_app_internal_port_0:
+      - app_app_internal_port_0
+      - network.incoming.bytes
+      network.outgoing.bytes.rate_app_app_internal_port_0:
+      - app_app_internal_port_0
+      - network.outgoing.bytes.rate
+      network.outpoing.packets_app_app_oam_port_0:
+      - app_app_oam_port_0
+      - network.outpoing.packets
+      network.incoming.packets.rate_app_app_data_port_0:
+      - app_app_data_port_0
+      - network.incoming.packets.rate
+      forwarder_app_app_internal_port_0:
+      - app_app_internal_port_0
+      - forwarder
+      forwarder_app_app_data_port_0:
+      - app_app_data_port_0
+      - forwarder
       disk.device.read.bytes.rate_app:
       - app
       - disk.device.read.bytes.rate
       disk.device.allocation_app:
       - app
       - disk.device.allocation
+      network.incoming.packets.rate_app_app_internal_port_0:
+      - app_app_internal_port_0
+      - network.incoming.packets.rate
       binding_app:
       - app
       - binding
       disk.device.write.bytes.rate_app:
       - app
       - disk.device.write.bytes.rate
-      binding_app_app_oam_0_port:
-      - app_app_oam_0_port
-      - binding
       disk.device.usage_app:
       - app
       - disk.device.usage
-      network.outpoing.packets_app_app_data_0_port:
-      - app_app_data_0_port
-      - network.outpoing.packets
-      network.outgoing.bytes_app_app_data_0_port:
-      - app_app_data_0_port
-      - network.outgoing.bytes
-      network.incoming.bytes_app_app_internal_0_port:
-      - app_app_internal_0_port
-      - network.incoming.bytes
-      forwarder_app_app_data_0_port:
-      - app_app_data_0_port
-      - forwarder
+      feature_app_app_data_port_0:
+      - app_app_data_port_0
+      - feature
+      network.outgoing.packets.rate_app_app_internal_port_0:
+      - app_app_internal_port_0
+      - network.outgoing.packets.rate
+      network.incoming.packets.rate_app_app_oam_port_0:
+      - app_app_oam_port_0
+      - network.incoming.packets.rate
+      network.incoming.packets_app_app_oam_port_0:
+      - app_app_oam_port_0
+      - network.incoming.packets
       disk.write.requests_app:
       - app
       - disk.write.requests
-      binding_app_app_internal_0_port:
-      - app_app_internal_0_port
-      - binding
+      attachment_app_app_oam_port_0:
+      - app_app_oam_port_0
+      - attachment
+      network.outgoing.packets.rate_app_app_data_port_0:
+      - app_app_data_port_0
+      - network.outgoing.packets.rate
       instance_app:
       - app
       - instance
-      attachment_app_app_internal_0_port:
-      - app_app_internal_0_port
-      - attachment
-      network.incoming.packets_app_app_data_0_port:
-      - app_app_data_0_port
-      - network.incoming.packets
-      network.outpoing.packets_app_app_internal_0_port:
-      - app_app_internal_0_port
-      - network.outpoing.packets
       disk.capacity_app:
       - app
       - disk.capacity
     requirements:
-      link_app_app_oam_0_port:
-      - app_app_oam_0_port
-      - link
-      dependency_app_app_internal_0_port:
-      - app_app_internal_0_port
+      dependency_app_app_oam_port_0:
+      - app_app_oam_port_0
+      - dependency
+      dependency_app_app_data_port_0:
+      - app_app_data_port_0
       - dependency
       dependency_app:
       - app
       - dependency
-      dependency_app_app_oam_0_port:
-      - app_app_oam_0_port
-      - dependency
+      link_app_app_data_port_0:
+      - app_app_data_port_0
+      - link
+      link_app_app_internal_port_0:
+      - app_app_internal_port_0
+      - link
       local_storage_app:
       - app
       - local_storage
-      link_app_app_internal_0_port:
-      - app_app_internal_0_port
-      - link
-      link_app_app_data_0_port:
-      - app_app_data_0_port
+      link_app_app_oam_port_0:
+      - app_app_oam_port_0
       - link
-      dependency_app_app_data_0_port:
-      - app_app_data_0_port
+      dependency_app_app_internal_port_0:
+      - app_app_internal_port_0
       - 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/catalogInstances/computewithtwosameporttypes/out/Nested_ioxServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_ioxServiceTemplate.yaml
index 49e8ee1c5c..2e97fde0fb 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_ioxServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_ioxServiceTemplate.yaml
@@ -11,177 +11,183 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
-    port_iox_data_0_port_ip_requirements:
-      type: list
-      required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.IpRequirements
-    port_iox_oam_0_port_exCP_naming:
-      type: org.openecomp.datatypes.Naming
-      required: true
-    port_iox_internal_0_port_network:
-      type: list
-      required: true
-      entry_schema:
-        type: string
-    port_iox_data_0_port_name:
-      type: list
+    port_iox_oam_port_0_network_role:
+      type: string
       required: true
-      entry_schema:
-        type: string
-    port_iox_data_0_port_related_networks:
+    port_iox_oam_port_0_fixed_ips:
       type: list
       required: true
       entry_schema:
-        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
-    vm_flavor_name:
+        type: org.openecomp.datatypes.heat.neutron.port.FixedIps
+    port_iox_data_port_0_network_role:
       type: string
       required: true
-    port_iox_data_0_port_subnetpoolid:
+    vm_flavor_name:
       type: string
       required: true
-    port_iox_data_0_port_allowed_address_pairs:
-      type: list
+    port_iox_oam_port_0_exCP_naming:
+      type: org.openecomp.datatypes.Naming
       required: true
-      entry_schema:
-        type: org.openecomp.datatypes.heat.network.AddressPair
-    port_iox_internal_0_port_ip_requirements:
-      type: list
+    port_iox_data_port_0_mac_requirements:
+      type: org.openecomp.datatypes.network.MacRequirements
       required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.IpRequirements
     vm_image_name:
       type: string
       required: true
-    port_iox_oam_0_port_name:
+    port_iox_oam_port_0_replacement_policy:
       type: list
       required: true
       entry_schema:
         type: string
-    port_iox_oam_0_port_network_role_tag:
-      type: string
+    port_iox_oam_port_0_mac_requirements:
+      type: org.openecomp.datatypes.network.MacRequirements
       required: true
-    port_iox_oam_0_port_subnetpoolid:
-      type: string
+    port_iox_internal_port_0_mac_requirements:
+      type: org.openecomp.datatypes.network.MacRequirements
       required: true
     compute_iox_user_data_format:
       type: list
       required: true
       entry_schema:
         type: string
-    port_iox_data_0_port_fixed_ips:
-      type: list
+    port_iox_internal_port_0_subnetpoolid:
+      type: string
       required: true
-      entry_schema:
-        type: org.openecomp.datatypes.heat.neutron.port.FixedIps
-    port_iox_internal_0_port_allowed_address_pairs:
+    port_iox_data_port_0_allowed_address_pairs:
       type: list
       required: true
       entry_schema:
         type: org.openecomp.datatypes.heat.network.AddressPair
-    compute_iox_config_drive:
+    port_iox_data_port_0_ip_requirements:
       type: list
       required: true
       entry_schema:
-        type: boolean
-    port_iox_internal_0_port_order:
-      type: integer
-      required: true
-    port_iox_oam_0_port_replacement_policy:
+        type: org.openecomp.datatypes.network.IpRequirements
+    port_iox_internal_port_0_related_networks:
       type: list
       required: true
       entry_schema:
-        type: string
-    port_iox_data_0_port_security_groups:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+    compute_iox_config_drive:
       type: list
       required: true
       entry_schema:
-        type: json
-    port_iox_internal_0_port_vlan_requirements:
+        type: boolean
+    port_iox_internal_port_0_vlan_requirements:
       type: list
       required: true
       entry_schema:
         type: org.openecomp.datatypes.network.VlanRequirements
-    compute_iox_image_update_policy:
+    port_iox_internal_port_0_order:
+      type: integer
+      required: true
+    port_iox_data_port_0_network:
       type: list
       required: true
       entry_schema:
         type: string
-    port_iox_oam_0_port_order:
+    port_iox_internal_port_0_network_role_tag:
+      type: string
+      required: true
+    port_iox_oam_port_0_order:
       type: integer
       required: true
-    port_iox_oam_0_port_network:
+    compute_iox_image_update_policy:
       type: list
       required: true
       entry_schema:
         type: string
-    port_iox_oam_0_port_related_networks:
+    port_iox_data_port_0_vlan_requirements:
       type: list
       required: true
       entry_schema:
-        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
-    port_iox_internal_0_port_security_groups:
+        type: org.openecomp.datatypes.network.VlanRequirements
+    port_iox_data_port_0_network_role_tag:
+      type: string
+      required: true
+    port_iox_internal_port_0_ip_requirements:
       type: list
       required: true
       entry_schema:
-        type: json
-    port_iox_oam_0_port_vlan_requirements:
+        type: org.openecomp.datatypes.network.IpRequirements
+    port_iox_oam_port_0_vlan_requirements:
       type: list
       required: true
       entry_schema:
         type: org.openecomp.datatypes.network.VlanRequirements
-    port_iox_data_0_port_order:
+    port_iox_data_port_0_order:
       type: integer
       required: true
-    port_iox_internal_0_port_name:
+    compute_iox_name:
       type: list
       required: true
       entry_schema:
         type: string
-    port_iox_oam_0_port_fixed_ips:
+    port_iox_oam_port_0_allowed_address_pairs:
       type: list
       required: true
       entry_schema:
-        type: org.openecomp.datatypes.heat.neutron.port.FixedIps
-    port_iox_data_0_port_vlan_requirements:
+        type: org.openecomp.datatypes.heat.network.AddressPair
+    port_iox_oam_port_0_network:
       type: list
       required: true
       entry_schema:
-        type: org.openecomp.datatypes.network.VlanRequirements
-    compute_iox_name:
+        type: string
+    port_iox_internal_port_0_name:
       type: list
       required: true
       entry_schema:
         type: string
-    port_iox_data_0_port_network:
+    port_iox_internal_port_0_allowed_address_pairs:
       type: list
       required: true
       entry_schema:
-        type: string
-    port_iox_internal_0_port_replacement_policy:
+        type: org.openecomp.datatypes.heat.network.AddressPair
+    port_iox_oam_port_0_network_role_tag:
+      type: string
+      required: true
+    port_iox_data_port_0_fixed_ips:
       type: list
       required: true
       entry_schema:
-        type: string
-    port_iox_internal_0_port_mac_requirements:
-      type: org.openecomp.datatypes.network.MacRequirements
+        type: org.openecomp.datatypes.heat.neutron.port.FixedIps
+    port_iox_data_port_0_subnetpoolid:
+      type: string
       required: true
-    port_iox_data_0_port_mac_requirements:
-      type: org.openecomp.datatypes.network.MacRequirements
+    port_iox_oam_port_0_security_groups:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_iox_internal_port_0_security_groups:
+      type: list
       required: true
-    port_iox_data_0_port_exCP_naming:
+      entry_schema:
+        type: json
+    port_iox_oam_port_0_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.IpRequirements
+    port_iox_data_port_0_exCP_naming:
       type: org.openecomp.datatypes.Naming
       required: true
-    port_iox_oam_0_port_network_role:
-      type: string
+    port_iox_data_port_0_related_networks:
+      type: list
       required: true
-    port_iox_internal_0_port_network_role:
-      type: string
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+    port_iox_data_port_0_security_groups:
+      type: list
       required: true
-    port_iox_data_0_port_network_role:
-      type: string
+      entry_schema:
+        type: json
+    port_iox_internal_port_0_network:
+      type: list
       required: true
-    port_iox_data_0_port_replacement_policy:
+      entry_schema:
+        type: string
+    port_iox_internal_port_0_replacement_policy:
       type: list
       required: true
       entry_schema:
@@ -191,6 +197,11 @@ topology_template:
       required: true
       entry_schema:
         type: json
+    port_iox_data_port_0_name:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     index_value:
       type: integer
       description: Index value of this substitution service template runtime instance
@@ -198,20 +209,13 @@ topology_template:
       default: 0
       constraints:
       - greater_or_equal: 0
-    port_iox_internal_0_port_network_role_tag:
+    port_iox_internal_port_0_network_role:
       type: string
       required: true
-    port_iox_internal_0_port_related_networks:
-      type: list
-      required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
-    port_iox_oam_0_port_allowed_address_pairs:
-      type: list
+    port_iox_internal_port_0_exCP_naming:
+      type: org.openecomp.datatypes.Naming
       required: true
-      entry_schema:
-        type: org.openecomp.datatypes.heat.network.AddressPair
-    port_iox_internal_0_port_subnetpoolid:
+    port_iox_oam_port_0_subnetpoolid:
       type: string
       required: true
     compute_iox_availability_zone:
@@ -219,75 +223,22 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    port_iox_oam_0_port_security_groups:
+    port_iox_oam_port_0_related_networks:
       type: list
       required: true
       entry_schema:
-        type: json
-    port_iox_oam_0_port_mac_requirements:
-      type: org.openecomp.datatypes.network.MacRequirements
-      required: true
-    port_iox_oam_0_port_ip_requirements:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+    port_iox_data_port_0_replacement_policy:
       type: list
       required: true
       entry_schema:
-        type: org.openecomp.datatypes.network.IpRequirements
-    port_iox_internal_0_port_exCP_naming:
-      type: org.openecomp.datatypes.Naming
-      required: true
-    port_iox_data_0_port_network_role_tag:
-      type: string
+        type: string
+    port_iox_oam_port_0_name:
+      type: list
       required: true
+      entry_schema:
+        type: string
   node_templates:
-    iox_iox_data_0_port:
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        replacement_policy:
-          get_input:
-          - port_iox_data_0_port_replacement_policy
-          - index_value
-        mac_requirements:
-          get_input: port_iox_data_0_port_mac_requirements
-        allowed_address_pairs:
-          get_input: port_iox_data_0_port_allowed_address_pairs
-        order:
-          get_input: port_iox_data_0_port_order
-        security_groups:
-          get_input:
-          - port_iox_data_0_port_security_groups
-          - index_value
-        exCP_naming:
-          get_input: port_iox_data_0_port_exCP_naming
-        vlan_requirements:
-          get_input: port_iox_data_0_port_vlan_requirements
-        subinterface_indicator: false
-        related_networks:
-          get_input: port_iox_data_0_port_related_networks
-        ip_requirements:
-          get_input: port_iox_data_0_port_ip_requirements
-        network_role_tag:
-          get_input: port_iox_data_0_port_network_role_tag
-        network_role:
-          get_input: port_iox_data_0_port_network_role
-        subnetpoolid:
-          get_input: port_iox_data_0_port_subnetpoolid
-        fixed_ips:
-          get_input:
-          - port_iox_data_0_port_fixed_ips
-          - index_value
-        name:
-          get_input:
-          - port_iox_data_0_port_name
-          - index_value
-        network:
-          get_input:
-          - port_iox_data_0_port_network
-          - index_value
-      requirements:
-      - binding:
-          capability: tosca.capabilities.network.Bindable
-          node: iox
-          relationship: tosca.relationships.network.BindsTo
     iox:
       type: org.openecomp.resource.vfc.compute.nodes.heat.iox
       properties:
@@ -319,94 +270,143 @@ topology_template:
           get_input:
           - compute_iox_user_data_format
           - index_value
-    iox_iox_oam_0_port:
+    iox_iox_internal_port_0:
+      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
+      properties:
+        replacement_policy:
+          get_input:
+          - port_iox_internal_port_0_replacement_policy
+          - index_value
+        mac_requirements:
+          get_input: port_iox_internal_port_0_mac_requirements
+        allowed_address_pairs:
+          get_input: port_iox_internal_port_0_allowed_address_pairs
+        order:
+          get_input: port_iox_internal_port_0_order
+        security_groups:
+          get_input:
+          - port_iox_internal_port_0_security_groups
+          - index_value
+        exCP_naming:
+          get_input: port_iox_internal_port_0_exCP_naming
+        vlan_requirements:
+          get_input: port_iox_internal_port_0_vlan_requirements
+        subinterface_indicator: false
+        related_networks:
+          get_input: port_iox_internal_port_0_related_networks
+        ip_requirements:
+          get_input: port_iox_internal_port_0_ip_requirements
+        network_role_tag:
+          get_input: port_iox_internal_port_0_network_role_tag
+        network_role:
+          get_input: port_iox_internal_port_0_network_role
+        subnetpoolid:
+          get_input: port_iox_internal_port_0_subnetpoolid
+        name:
+          get_input:
+          - port_iox_internal_port_0_name
+          - index_value
+        network:
+          get_input:
+          - port_iox_internal_port_0_network
+          - index_value
+      requirements:
+      - binding:
+          capability: tosca.capabilities.network.Bindable
+          node: iox
+          relationship: tosca.relationships.network.BindsTo
+    iox_iox_oam_port_0:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         replacement_policy:
           get_input:
-          - port_iox_oam_0_port_replacement_policy
+          - port_iox_oam_port_0_replacement_policy
           - index_value
         mac_requirements:
-          get_input: port_iox_oam_0_port_mac_requirements
+          get_input: port_iox_oam_port_0_mac_requirements
         allowed_address_pairs:
-          get_input: port_iox_oam_0_port_allowed_address_pairs
+          get_input: port_iox_oam_port_0_allowed_address_pairs
         order:
-          get_input: port_iox_oam_0_port_order
+          get_input: port_iox_oam_port_0_order
         security_groups:
           get_input:
-          - port_iox_oam_0_port_security_groups
+          - port_iox_oam_port_0_security_groups
           - index_value
         exCP_naming:
-          get_input: port_iox_oam_0_port_exCP_naming
+          get_input: port_iox_oam_port_0_exCP_naming
         vlan_requirements:
-          get_input: port_iox_oam_0_port_vlan_requirements
+          get_input: port_iox_oam_port_0_vlan_requirements
         subinterface_indicator: false
         related_networks:
-          get_input: port_iox_oam_0_port_related_networks
+          get_input: port_iox_oam_port_0_related_networks
         ip_requirements:
-          get_input: port_iox_oam_0_port_ip_requirements
+          get_input: port_iox_oam_port_0_ip_requirements
         network_role_tag:
-          get_input: port_iox_oam_0_port_network_role_tag
+          get_input: port_iox_oam_port_0_network_role_tag
         network_role:
-          get_input: port_iox_oam_0_port_network_role
+          get_input: port_iox_oam_port_0_network_role
         subnetpoolid:
-          get_input: port_iox_oam_0_port_subnetpoolid
+          get_input: port_iox_oam_port_0_subnetpoolid
         fixed_ips:
           get_input:
-          - port_iox_oam_0_port_fixed_ips
+          - port_iox_oam_port_0_fixed_ips
           - index_value
         name:
           get_input:
-          - port_iox_oam_0_port_name
+          - port_iox_oam_port_0_name
           - index_value
         network:
           get_input:
-          - port_iox_oam_0_port_network
+          - port_iox_oam_port_0_network
           - index_value
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
           node: iox
           relationship: tosca.relationships.network.BindsTo
-    iox_iox_internal_0_port:
+    iox_iox_data_port_0:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         replacement_policy:
           get_input:
-          - port_iox_internal_0_port_replacement_policy
+          - port_iox_data_port_0_replacement_policy
           - index_value
         mac_requirements:
-          get_input: port_iox_internal_0_port_mac_requirements
+          get_input: port_iox_data_port_0_mac_requirements
         allowed_address_pairs:
-          get_input: port_iox_internal_0_port_allowed_address_pairs
+          get_input: port_iox_data_port_0_allowed_address_pairs
         order:
-          get_input: port_iox_internal_0_port_order
+          get_input: port_iox_data_port_0_order
         security_groups:
           get_input:
-          - port_iox_internal_0_port_security_groups
+          - port_iox_data_port_0_security_groups
           - index_value
         exCP_naming:
-          get_input: port_iox_internal_0_port_exCP_naming
+          get_input: port_iox_data_port_0_exCP_naming
         vlan_requirements:
-          get_input: port_iox_internal_0_port_vlan_requirements
+          get_input: port_iox_data_port_0_vlan_requirements
         subinterface_indicator: false
         related_networks:
-          get_input: port_iox_internal_0_port_related_networks
+          get_input: port_iox_data_port_0_related_networks
         ip_requirements:
-          get_input: port_iox_internal_0_port_ip_requirements
+          get_input: port_iox_data_port_0_ip_requirements
         network_role_tag:
-          get_input: port_iox_internal_0_port_network_role_tag
+          get_input: port_iox_data_port_0_network_role_tag
         network_role:
-          get_input: port_iox_internal_0_port_network_role
+          get_input: port_iox_data_port_0_network_role
         subnetpoolid:
-          get_input: port_iox_internal_0_port_subnetpoolid
+          get_input: port_iox_data_port_0_subnetpoolid
+        fixed_ips:
+          get_input:
+          - port_iox_data_port_0_fixed_ips
+          - index_value
         name:
           get_input:
-          - port_iox_internal_0_port_name
+          - port_iox_data_port_0_name
           - index_value
         network:
           get_input:
-          - port_iox_internal_0_port_network
+          - port_iox_data_port_0_network
           - index_value
       requirements:
       - binding:
@@ -416,9 +416,6 @@ topology_template:
   substitution_mappings:
     node_type: org.openecomp.resource.abstract.nodes.iox
     capabilities:
-      forwarder_iox_iox_oam_0_port:
-      - iox_iox_oam_0_port
-      - forwarder
       cpu.delta_iox:
       - iox
       - cpu.delta
@@ -428,23 +425,23 @@ topology_template:
       memory_iox:
       - iox
       - memory
-      network.outgoing.packets.rate_iox_iox_data_0_port:
-      - iox_iox_data_0_port
-      - network.outgoing.packets.rate
       disk.device.read.bytes_iox:
       - iox
       - disk.device.read.bytes
       disk.read.requests_iox:
       - iox
       - disk.read.requests
+      network.incoming.packets_iox_iox_data_port_0:
+      - iox_iox_data_port_0
+      - network.incoming.packets
       disk.write.requests_iox:
       - iox
       - disk.write.requests
-      network.incoming.bytes_iox_iox_oam_0_port:
-      - iox_iox_oam_0_port
-      - network.incoming.bytes
-      network.incoming.packets.rate_iox_iox_internal_0_port:
-      - iox_iox_internal_0_port
+      network.outpoing.packets_iox_iox_internal_port_0:
+      - iox_iox_internal_port_0
+      - network.outpoing.packets
+      network.incoming.packets.rate_iox_iox_data_port_0:
+      - iox_iox_data_port_0
       - network.incoming.packets.rate
       disk.device.read.requests.rate_iox:
       - iox
@@ -458,90 +455,81 @@ topology_template:
       disk.write.bytes_iox:
       - iox
       - disk.write.bytes
+      network.outgoing.packets.rate_iox_iox_internal_port_0:
+      - iox_iox_internal_port_0
+      - network.outgoing.packets.rate
+      network.incoming.packets_iox_iox_internal_port_0:
+      - iox_iox_internal_port_0
+      - network.incoming.packets
       disk.device.write.requests_iox:
       - iox
       - disk.device.write.requests
       disk.device.allocation_iox:
       - iox
       - disk.device.allocation
-      feature_iox_iox_data_0_port:
-      - iox_iox_data_0_port
-      - feature
       disk.root.size_iox:
       - iox
       - disk.root.size
+      network.outgoing.bytes.rate_iox_iox_oam_port_0:
+      - iox_iox_oam_port_0
+      - network.outgoing.bytes.rate
       vcpus_iox:
       - iox
       - vcpus
       disk.device.iops_iox:
       - iox
       - disk.device.iops
-      network.outgoing.bytes.rate_iox_iox_data_0_port:
-      - iox_iox_data_0_port
-      - network.outgoing.bytes.rate
+      network.outgoing.bytes_iox_iox_data_port_0:
+      - iox_iox_data_port_0
+      - network.outgoing.bytes
       disk.read.bytes.rate_iox:
       - iox
       - disk.read.bytes.rate
-      network.outgoing.bytes_iox_iox_oam_0_port:
-      - iox_iox_oam_0_port
+      feature_iox_iox_oam_port_0:
+      - iox_iox_oam_port_0
+      - feature
+      network.outgoing.bytes_iox_iox_internal_port_0:
+      - iox_iox_internal_port_0
       - network.outgoing.bytes
-      attachment_iox_iox_data_0_port:
-      - iox_iox_data_0_port
-      - attachment
-      network.incoming.packets.rate_iox_iox_oam_0_port:
-      - iox_iox_oam_0_port
+      binding_iox_iox_data_port_0:
+      - iox_iox_data_port_0
+      - binding
+      network.incoming.packets.rate_iox_iox_internal_port_0:
+      - iox_iox_internal_port_0
       - network.incoming.packets.rate
       disk.latency_iox:
       - iox
       - disk.latency
-      network.incoming.packets.rate_iox_iox_data_0_port:
-      - iox_iox_data_0_port
+      network.incoming.bytes.rate_iox_iox_data_port_0:
+      - iox_iox_data_port_0
+      - network.incoming.bytes.rate
+      network.incoming.packets.rate_iox_iox_oam_port_0:
+      - iox_iox_oam_port_0
       - network.incoming.packets.rate
-      network.incoming.bytes_iox_iox_internal_0_port:
-      - iox_iox_internal_0_port
-      - network.incoming.bytes
       cpu_util_iox:
       - iox
       - cpu_util
-      binding_iox_iox_oam_0_port:
-      - iox_iox_oam_0_port
-      - binding
-      network.incoming.bytes_iox_iox_data_0_port:
-      - iox_iox_data_0_port
-      - network.incoming.bytes
       disk.device.capacity_iox:
       - iox
       - disk.device.capacity
       disk.iops_iox:
       - iox
       - disk.iops
-      network.outpoing.packets_iox_iox_internal_0_port:
-      - iox_iox_internal_0_port
-      - network.outpoing.packets
       endpoint_iox:
       - iox
       - endpoint
-      binding_iox_iox_internal_0_port:
-      - iox_iox_internal_0_port
-      - binding
       disk.device.read.requests_iox:
       - iox
       - disk.device.read.requests
       memory.usage_iox:
       - iox
       - memory.usage
-      attachment_iox_iox_internal_0_port:
-      - iox_iox_internal_0_port
+      attachment_iox_iox_data_port_0:
+      - iox_iox_data_port_0
       - attachment
-      network.outgoing.bytes_iox_iox_internal_0_port:
-      - iox_iox_internal_0_port
-      - network.outgoing.bytes
       cpu_iox:
       - iox
       - cpu
-      feature_iox_iox_oam_0_port:
-      - iox_iox_oam_0_port
-      - feature
       disk.usage_iox:
       - iox
       - disk.usage
@@ -551,42 +539,54 @@ topology_template:
       feature_iox:
       - iox
       - feature
+      network.incoming.bytes_iox_iox_data_port_0:
+      - iox_iox_data_port_0
+      - network.incoming.bytes
       memory.resident_iox:
       - iox
       - memory.resident
       disk.device.write.bytes_iox:
       - iox
       - disk.device.write.bytes
-      network.outgoing.packets.rate_iox_iox_internal_0_port:
-      - iox_iox_internal_0_port
-      - network.outgoing.packets.rate
-      binding_iox_iox_data_0_port:
-      - iox_iox_data_0_port
-      - binding
-      network.outgoing.bytes.rate_iox_iox_oam_0_port:
-      - iox_iox_oam_0_port
-      - network.outgoing.bytes.rate
-      network.incoming.bytes.rate_iox_iox_internal_0_port:
-      - iox_iox_internal_0_port
-      - network.incoming.bytes.rate
-      network.incoming.bytes.rate_iox_iox_oam_0_port:
-      - iox_iox_oam_0_port
-      - network.incoming.bytes.rate
+      attachment_iox_iox_oam_port_0:
+      - iox_iox_oam_port_0
+      - attachment
+      network.incoming.packets_iox_iox_oam_port_0:
+      - iox_iox_oam_port_0
+      - network.incoming.packets
+      feature_iox_iox_internal_port_0:
+      - iox_iox_internal_port_0
+      - feature
+      network.outpoing.packets_iox_iox_oam_port_0:
+      - iox_iox_oam_port_0
+      - network.outpoing.packets
       disk.allocation_iox:
       - iox
       - disk.allocation
-      network.outgoing.packets.rate_iox_iox_oam_0_port:
-      - iox_iox_oam_0_port
-      - network.outgoing.packets.rate
+      forwarder_iox_iox_internal_port_0:
+      - iox_iox_internal_port_0
+      - forwarder
+      binding_iox_iox_oam_port_0:
+      - iox_iox_oam_port_0
+      - binding
+      network.incoming.bytes_iox_iox_internal_port_0:
+      - iox_iox_internal_port_0
+      - network.incoming.bytes
       binding_iox:
       - iox
       - binding
       os_iox:
       - iox
       - os
+      binding_iox_iox_internal_port_0:
+      - iox_iox_internal_port_0
+      - binding
       host_iox:
       - iox
       - host
+      network.outgoing.packets.rate_iox_iox_oam_port_0:
+      - iox_iox_oam_port_0
+      - network.outgoing.packets.rate
       disk.write.requests.rate_iox:
       - iox
       - disk.write.requests.rate
@@ -596,79 +596,79 @@ topology_template:
       disk.read.bytes_iox:
       - iox
       - disk.read.bytes
-      network.incoming.packets_iox_iox_oam_0_port:
-      - iox_iox_oam_0_port
-      - network.incoming.packets
+      network.outgoing.bytes.rate_iox_iox_internal_port_0:
+      - iox_iox_internal_port_0
+      - network.outgoing.bytes.rate
       instance_iox:
       - iox
       - instance
       disk.ephemeral.size_iox:
       - iox
       - disk.ephemeral.size
-      network.outpoing.packets_iox_iox_data_0_port:
-      - iox_iox_data_0_port
-      - network.outpoing.packets
-      attachment_iox_iox_oam_0_port:
-      - iox_iox_oam_0_port
+      attachment_iox_iox_internal_port_0:
+      - iox_iox_internal_port_0
       - attachment
-      feature_iox_iox_internal_0_port:
-      - iox_iox_internal_0_port
-      - feature
-      network.incoming.packets_iox_iox_internal_0_port:
-      - iox_iox_internal_0_port
-      - network.incoming.packets
-      network.outpoing.packets_iox_iox_oam_0_port:
-      - iox_iox_oam_0_port
-      - network.outpoing.packets
-      forwarder_iox_iox_data_0_port:
-      - iox_iox_data_0_port
+      forwarder_iox_iox_data_port_0:
+      - iox_iox_data_port_0
       - forwarder
+      network.incoming.bytes.rate_iox_iox_internal_port_0:
+      - iox_iox_internal_port_0
+      - network.incoming.bytes.rate
+      forwarder_iox_iox_oam_port_0:
+      - iox_iox_oam_port_0
+      - forwarder
+      network.incoming.bytes_iox_iox_oam_port_0:
+      - iox_iox_oam_port_0
+      - network.incoming.bytes
+      feature_iox_iox_data_port_0:
+      - iox_iox_data_port_0
+      - feature
+      network.incoming.bytes.rate_iox_iox_oam_port_0:
+      - iox_iox_oam_port_0
+      - network.incoming.bytes.rate
+      network.outgoing.bytes_iox_iox_oam_port_0:
+      - iox_iox_oam_port_0
+      - network.outgoing.bytes
       disk.device.read.bytes.rate_iox:
       - iox
       - disk.device.read.bytes.rate
-      network.incoming.bytes.rate_iox_iox_data_0_port:
-      - iox_iox_data_0_port
-      - network.incoming.bytes.rate
-      network.incoming.packets_iox_iox_data_0_port:
-      - iox_iox_data_0_port
-      - network.incoming.packets
+      network.outpoing.packets_iox_iox_data_port_0:
+      - iox_iox_data_port_0
+      - network.outpoing.packets
+      network.outgoing.bytes.rate_iox_iox_data_port_0:
+      - iox_iox_data_port_0
+      - network.outgoing.bytes.rate
       disk.device.write.bytes.rate_iox:
       - iox
       - disk.device.write.bytes.rate
-      network.outgoing.bytes.rate_iox_iox_internal_0_port:
-      - iox_iox_internal_0_port
-      - network.outgoing.bytes.rate
-      forwarder_iox_iox_internal_0_port:
-      - iox_iox_internal_0_port
-      - forwarder
       disk.device.usage_iox:
       - iox
       - disk.device.usage
-      network.outgoing.bytes_iox_iox_data_0_port:
-      - iox_iox_data_0_port
-      - network.outgoing.bytes
+      network.outgoing.packets.rate_iox_iox_data_port_0:
+      - iox_iox_data_port_0
+      - network.outgoing.packets.rate
     requirements:
-      dependency_iox_iox_internal_0_port:
-      - iox_iox_internal_0_port
+      dependency_iox_iox_data_port_0:
+      - iox_iox_data_port_0
       - dependency
-      link_iox_iox_oam_0_port:
-      - iox_iox_oam_0_port
-      - link
       dependency_iox:
       - iox
       - dependency
-      dependency_iox_iox_data_0_port:
-      - iox_iox_data_0_port
+      dependency_iox_iox_oam_port_0:
+      - iox_iox_oam_port_0
       - dependency
-      link_iox_iox_data_0_port:
-      - iox_iox_data_0_port
-      - link
-      link_iox_iox_internal_0_port:
-      - iox_iox_internal_0_port
+      link_iox_iox_internal_port_0:
+      - iox_iox_internal_port_0
       - link
+      dependency_iox_iox_internal_port_0:
+      - iox_iox_internal_port_0
+      - dependency
       local_storage_iox:
       - iox
       - local_storage
-      dependency_iox_iox_oam_0_port:
-      - iox_iox_oam_0_port
-      - dependency
+      link_iox_iox_data_port_0:
+      - iox_iox_data_port_0
+      - link
+      link_iox_iox_oam_port_0:
+      - iox_iox_oam_port_0
+      - link
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_pltServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_pltServiceTemplate.yaml
index bc794e70bd..27818cb820 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_pltServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_pltServiceTemplate.yaml
@@ -11,151 +11,153 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
-    port_plt_data_0_port_related_networks:
-      type: list
-      required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
-    port_plt_oam_0_port_exCP_naming:
-      type: org.openecomp.datatypes.Naming
-      required: true
-    port_plt_oam_0_port_subnetpoolid:
+    port_plt_oam_port_0_network_role_tag:
       type: string
       required: true
-    port_plt_internal_0_port_allowed_address_pairs:
+    port_plt_data_port_0_allowed_address_pairs:
       type: list
       required: true
       entry_schema:
         type: org.openecomp.datatypes.heat.network.AddressPair
-    port_plt_oam_0_port_security_groups:
+    port_plt_oam_port_0_ip_requirements:
       type: list
       required: true
       entry_schema:
-        type: json
+        type: org.openecomp.datatypes.network.IpRequirements
+    port_plt_oam_port_0_network_role:
+      type: string
+      required: true
     compute_plt_config_drive:
       type: list
       required: true
       entry_schema:
         type: boolean
-    port_plt_data_0_port_subnetpoolid:
+    port_plt_data_port_0_network_role_tag:
       type: string
       required: true
     vm_flavor_name:
       type: string
       required: true
-    port_plt_internal_0_port_vlan_requirements:
+    port_plt_internal_port_0_vlan_requirements:
       type: list
       required: true
       entry_schema:
         type: org.openecomp.datatypes.network.VlanRequirements
-    port_plt_data_0_port_fixed_ips:
+    port_plt_data_port_0_network_role:
+      type: string
+      required: true
+    port_plt_internal_port_0_replacement_policy:
       type: list
       required: true
       entry_schema:
-        type: org.openecomp.datatypes.heat.neutron.port.FixedIps
+        type: string
+    port_plt_data_port_0_security_groups:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     vm_image_name:
       type: string
       required: true
-    compute_plt_availability_zone:
+    port_plt_oam_port_0_name:
       type: list
       required: true
       entry_schema:
         type: string
-    port_plt_oam_0_port_name:
+    compute_plt_availability_zone:
       type: list
       required: true
       entry_schema:
         type: string
-    port_plt_internal_0_port_security_groups:
-      type: list
-      required: true
-      entry_schema:
-        type: json
-    port_plt_internal_0_port_network_role_tag:
+    port_plt_internal_port_0_network_role:
       type: string
       required: true
-    port_plt_oam_0_port_ip_requirements:
+    port_plt_data_port_0_ip_requirements:
       type: list
       required: true
       entry_schema:
         type: org.openecomp.datatypes.network.IpRequirements
-    port_plt_data_0_port_mac_requirements:
-      type: org.openecomp.datatypes.network.MacRequirements
-      required: true
-    port_plt_data_0_port_allowed_address_pairs:
+    port_plt_data_port_0_replacement_policy:
       type: list
       required: true
       entry_schema:
-        type: org.openecomp.datatypes.heat.network.AddressPair
-    port_plt_internal_0_port_subnetpoolid:
+        type: string
+    port_plt_internal_port_0_subnetpoolid:
       type: string
       required: true
-    port_plt_data_0_port_ip_requirements:
+    port_plt_data_port_0_order:
+      type: integer
+      required: true
+    port_plt_oam_port_0_security_groups:
       type: list
       required: true
       entry_schema:
-        type: org.openecomp.datatypes.network.IpRequirements
-    port_plt_internal_0_port_network:
+        type: json
+    port_plt_oam_port_0_mac_requirements:
+      type: org.openecomp.datatypes.network.MacRequirements
+      required: true
+    port_plt_internal_port_0_allowed_address_pairs:
       type: list
       required: true
       entry_schema:
-        type: string
-    compute_plt_metadata:
+        type: org.openecomp.datatypes.heat.network.AddressPair
+    port_plt_internal_port_0_ip_requirements:
       type: list
       required: true
       entry_schema:
-        type: json
-    port_plt_data_0_port_security_groups:
+        type: org.openecomp.datatypes.network.IpRequirements
+    compute_plt_metadata:
       type: list
       required: true
       entry_schema:
         type: json
-    port_plt_oam_0_port_related_networks:
+    port_plt_internal_port_0_related_networks:
       type: list
       required: true
       entry_schema:
         type: org.openecomp.datatypes.network.RelatedNetworksAssignments
-    port_plt_internal_0_port_mac_requirements:
-      type: org.openecomp.datatypes.network.MacRequirements
+    port_plt_oam_port_0_fixed_ips:
+      type: list
       required: true
-    port_plt_data_0_port_order:
-      type: integer
+      entry_schema:
+        type: org.openecomp.datatypes.heat.neutron.port.FixedIps
+    port_plt_internal_port_0_security_groups:
+      type: list
       required: true
-    port_plt_data_0_port_vlan_requirements:
+      entry_schema:
+        type: json
+    port_plt_data_port_0_vlan_requirements:
       type: list
       required: true
       entry_schema:
         type: org.openecomp.datatypes.network.VlanRequirements
-    port_plt_data_0_port_network_role_tag:
-      type: string
-      required: true
-    port_plt_internal_0_port_order:
-      type: integer
-      required: true
-    port_plt_internal_0_port_ip_requirements:
+    port_plt_oam_port_0_network:
       type: list
       required: true
       entry_schema:
-        type: org.openecomp.datatypes.network.IpRequirements
-    port_plt_oam_0_port_fixed_ips:
+        type: string
+    port_plt_oam_port_0_replacement_policy:
       type: list
       required: true
       entry_schema:
-        type: org.openecomp.datatypes.heat.neutron.port.FixedIps
-    port_plt_oam_0_port_network_role_tag:
-      type: string
-      required: true
-    port_plt_internal_0_port_name:
+        type: string
+    port_plt_oam_port_0_related_networks:
       type: list
       required: true
       entry_schema:
-        type: string
-    port_plt_internal_0_port_related_networks:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+    port_plt_data_port_0_related_networks:
       type: list
       required: true
       entry_schema:
         type: org.openecomp.datatypes.network.RelatedNetworksAssignments
-    port_plt_oam_0_port_order:
+    port_plt_internal_port_0_order:
+      type: integer
+      required: true
+    port_plt_internal_port_0_mac_requirements:
+      type: org.openecomp.datatypes.network.MacRequirements
+      required: true
+    port_plt_oam_port_0_order:
       type: integer
       required: true
     compute_plt_image_update_policy:
@@ -163,46 +165,33 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    port_plt_oam_0_port_network_role:
+    port_plt_oam_port_0_subnetpoolid:
       type: string
       required: true
-    port_plt_oam_0_port_allowed_address_pairs:
-      type: list
+    port_plt_internal_port_0_network_role_tag:
+      type: string
       required: true
-      entry_schema:
-        type: org.openecomp.datatypes.heat.network.AddressPair
-    port_plt_data_0_port_name:
-      type: list
+    port_plt_data_port_0_subnetpoolid:
+      type: string
       required: true
-      entry_schema:
-        type: string
-    port_plt_data_0_port_exCP_naming:
+    port_plt_data_port_0_exCP_naming:
       type: org.openecomp.datatypes.Naming
       required: true
-    port_plt_internal_0_port_network_role:
-      type: string
-      required: true
     compute_plt_user_data_format:
       type: list
       required: true
       entry_schema:
         type: string
-    port_plt_internal_0_port_replacement_policy:
+    port_plt_internal_port_0_network:
       type: list
       required: true
       entry_schema:
         type: string
-    port_plt_data_0_port_network:
+    port_plt_data_port_0_fixed_ips:
       type: list
       required: true
       entry_schema:
-        type: string
-    port_plt_data_0_port_network_role:
-      type: string
-      required: true
-    port_plt_internal_0_port_exCP_naming:
-      type: org.openecomp.datatypes.Naming
-      required: true
+        type: org.openecomp.datatypes.heat.neutron.port.FixedIps
     index_value:
       type: integer
       description: Index value of this substitution service template runtime instance
@@ -210,123 +199,138 @@ topology_template:
       default: 0
       constraints:
       - greater_or_equal: 0
-    port_plt_oam_0_port_network:
+    port_plt_data_port_0_mac_requirements:
+      type: org.openecomp.datatypes.network.MacRequirements
+      required: true
+    port_plt_internal_port_0_name:
       type: list
       required: true
       entry_schema:
         type: string
-    port_plt_oam_0_port_replacement_policy:
+    port_plt_oam_port_0_vlan_requirements:
       type: list
       required: true
       entry_schema:
-        type: string
-    port_plt_data_0_port_replacement_policy:
+        type: org.openecomp.datatypes.network.VlanRequirements
+    compute_plt_name:
       type: list
       required: true
       entry_schema:
         type: string
-    port_plt_oam_0_port_mac_requirements:
-      type: org.openecomp.datatypes.network.MacRequirements
+    port_plt_internal_port_0_exCP_naming:
+      type: org.openecomp.datatypes.Naming
       required: true
-    compute_plt_name:
+    port_plt_data_port_0_name:
       type: list
       required: true
       entry_schema:
         type: string
-    port_plt_oam_0_port_vlan_requirements:
+    port_plt_data_port_0_network:
       type: list
       required: true
       entry_schema:
-        type: org.openecomp.datatypes.network.VlanRequirements
+        type: string
+    port_plt_oam_port_0_exCP_naming:
+      type: org.openecomp.datatypes.Naming
+      required: true
+    port_plt_oam_port_0_allowed_address_pairs:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.heat.network.AddressPair
   node_templates:
-    plt_plt_internal_0_port:
+    plt_plt_data_port_0:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         replacement_policy:
           get_input:
-          - port_plt_internal_0_port_replacement_policy
+          - port_plt_data_port_0_replacement_policy
           - index_value
         mac_requirements:
-          get_input: port_plt_internal_0_port_mac_requirements
+          get_input: port_plt_data_port_0_mac_requirements
         allowed_address_pairs:
-          get_input: port_plt_internal_0_port_allowed_address_pairs
+          get_input: port_plt_data_port_0_allowed_address_pairs
         order:
-          get_input: port_plt_internal_0_port_order
+          get_input: port_plt_data_port_0_order
         security_groups:
           get_input:
-          - port_plt_internal_0_port_security_groups
+          - port_plt_data_port_0_security_groups
           - index_value
         exCP_naming:
-          get_input: port_plt_internal_0_port_exCP_naming
+          get_input: port_plt_data_port_0_exCP_naming
         vlan_requirements:
-          get_input: port_plt_internal_0_port_vlan_requirements
+          get_input: port_plt_data_port_0_vlan_requirements
         subinterface_indicator: false
         related_networks:
-          get_input: port_plt_internal_0_port_related_networks
+          get_input: port_plt_data_port_0_related_networks
         ip_requirements:
-          get_input: port_plt_internal_0_port_ip_requirements
+          get_input: port_plt_data_port_0_ip_requirements
         network_role_tag:
-          get_input: port_plt_internal_0_port_network_role_tag
+          get_input: port_plt_data_port_0_network_role_tag
         network_role:
-          get_input: port_plt_internal_0_port_network_role
+          get_input: port_plt_data_port_0_network_role
         subnetpoolid:
-          get_input: port_plt_internal_0_port_subnetpoolid
+          get_input: port_plt_data_port_0_subnetpoolid
+        fixed_ips:
+          get_input:
+          - port_plt_data_port_0_fixed_ips
+          - index_value
         name:
           get_input:
-          - port_plt_internal_0_port_name
+          - port_plt_data_port_0_name
           - index_value
         network:
           get_input:
-          - port_plt_internal_0_port_network
+          - port_plt_data_port_0_network
           - index_value
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
           node: plt
           relationship: tosca.relationships.network.BindsTo
-    plt_plt_data_0_port:
+    plt_plt_oam_port_0:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         replacement_policy:
           get_input:
-          - port_plt_data_0_port_replacement_policy
+          - port_plt_oam_port_0_replacement_policy
           - index_value
         mac_requirements:
-          get_input: port_plt_data_0_port_mac_requirements
+          get_input: port_plt_oam_port_0_mac_requirements
         allowed_address_pairs:
-          get_input: port_plt_data_0_port_allowed_address_pairs
+          get_input: port_plt_oam_port_0_allowed_address_pairs
         order:
-          get_input: port_plt_data_0_port_order
+          get_input: port_plt_oam_port_0_order
         security_groups:
           get_input:
-          - port_plt_data_0_port_security_groups
+          - port_plt_oam_port_0_security_groups
           - index_value
         exCP_naming:
-          get_input: port_plt_data_0_port_exCP_naming
+          get_input: port_plt_oam_port_0_exCP_naming
         vlan_requirements:
-          get_input: port_plt_data_0_port_vlan_requirements
+          get_input: port_plt_oam_port_0_vlan_requirements
         subinterface_indicator: false
         related_networks:
-          get_input: port_plt_data_0_port_related_networks
+          get_input: port_plt_oam_port_0_related_networks
         ip_requirements:
-          get_input: port_plt_data_0_port_ip_requirements
+          get_input: port_plt_oam_port_0_ip_requirements
         network_role_tag:
-          get_input: port_plt_data_0_port_network_role_tag
+          get_input: port_plt_oam_port_0_network_role_tag
         network_role:
-          get_input: port_plt_data_0_port_network_role
+          get_input: port_plt_oam_port_0_network_role
         subnetpoolid:
-          get_input: port_plt_data_0_port_subnetpoolid
+          get_input: port_plt_oam_port_0_subnetpoolid
         fixed_ips:
           get_input:
-          - port_plt_data_0_port_fixed_ips
+          - port_plt_oam_port_0_fixed_ips
           - index_value
         name:
           get_input:
-          - port_plt_data_0_port_name
+          - port_plt_oam_port_0_name
           - index_value
         network:
           get_input:
-          - port_plt_data_0_port_network
+          - port_plt_oam_port_0_network
           - index_value
       requirements:
       - binding:
@@ -364,49 +368,45 @@ topology_template:
           get_input:
           - compute_plt_user_data_format
           - index_value
-    plt_plt_oam_0_port:
+    plt_plt_internal_port_0:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         replacement_policy:
           get_input:
-          - port_plt_oam_0_port_replacement_policy
+          - port_plt_internal_port_0_replacement_policy
           - index_value
         mac_requirements:
-          get_input: port_plt_oam_0_port_mac_requirements
+          get_input: port_plt_internal_port_0_mac_requirements
         allowed_address_pairs:
-          get_input: port_plt_oam_0_port_allowed_address_pairs
+          get_input: port_plt_internal_port_0_allowed_address_pairs
         order:
-          get_input: port_plt_oam_0_port_order
+          get_input: port_plt_internal_port_0_order
         security_groups:
           get_input:
-          - port_plt_oam_0_port_security_groups
+          - port_plt_internal_port_0_security_groups
           - index_value
         exCP_naming:
-          get_input: port_plt_oam_0_port_exCP_naming
+          get_input: port_plt_internal_port_0_exCP_naming
         vlan_requirements:
-          get_input: port_plt_oam_0_port_vlan_requirements
+          get_input: port_plt_internal_port_0_vlan_requirements
         subinterface_indicator: false
         related_networks:
-          get_input: port_plt_oam_0_port_related_networks
+          get_input: port_plt_internal_port_0_related_networks
         ip_requirements:
-          get_input: port_plt_oam_0_port_ip_requirements
+          get_input: port_plt_internal_port_0_ip_requirements
         network_role_tag:
-          get_input: port_plt_oam_0_port_network_role_tag
+          get_input: port_plt_internal_port_0_network_role_tag
         network_role:
-          get_input: port_plt_oam_0_port_network_role
+          get_input: port_plt_internal_port_0_network_role
         subnetpoolid:
-          get_input: port_plt_oam_0_port_subnetpoolid
-        fixed_ips:
-          get_input:
-          - port_plt_oam_0_port_fixed_ips
-          - index_value
+          get_input: port_plt_internal_port_0_subnetpoolid
         name:
           get_input:
-          - port_plt_oam_0_port_name
+          - port_plt_internal_port_0_name
           - index_value
         network:
           get_input:
-          - port_plt_oam_0_port_network
+          - port_plt_internal_port_0_network
           - index_value
       requirements:
       - binding:
@@ -416,219 +416,219 @@ topology_template:
   substitution_mappings:
     node_type: org.openecomp.resource.abstract.nodes.plt
     capabilities:
-      network.outgoing.bytes.rate_plt_plt_oam_0_port:
-      - plt_plt_oam_0_port
-      - network.outgoing.bytes.rate
+      network.incoming.packets_plt_plt_oam_port_0:
+      - plt_plt_oam_port_0
+      - network.incoming.packets
+      attachment_plt_plt_internal_port_0:
+      - plt_plt_internal_port_0
+      - attachment
+      network.incoming.bytes.rate_plt_plt_internal_port_0:
+      - plt_plt_internal_port_0
+      - network.incoming.bytes.rate
       disk.device.usage_plt:
       - plt
       - disk.device.usage
+      binding_plt_plt_data_port_0:
+      - plt_plt_data_port_0
+      - binding
       disk.iops_plt:
       - plt
       - disk.iops
       disk.read.bytes.rate_plt:
       - plt
       - disk.read.bytes.rate
+      network.incoming.bytes.rate_plt_plt_data_port_0:
+      - plt_plt_data_port_0
+      - network.incoming.bytes.rate
       disk.device.allocation_plt:
       - plt
       - disk.device.allocation
       disk.device.write.bytes.rate_plt:
       - plt
       - disk.device.write.bytes.rate
+      network.outgoing.packets.rate_plt_plt_internal_port_0:
+      - plt_plt_internal_port_0
+      - network.outgoing.packets.rate
       disk.read.bytes_plt:
       - plt
       - disk.read.bytes
-      network.incoming.packets_plt_plt_internal_0_port:
-      - plt_plt_internal_0_port
-      - network.incoming.packets
       disk.capacity_plt:
       - plt
       - disk.capacity
       disk.write.bytes_plt:
       - plt
       - disk.write.bytes
+      network.outpoing.packets_plt_plt_oam_port_0:
+      - plt_plt_oam_port_0
+      - network.outpoing.packets
+      network.outgoing.bytes.rate_plt_plt_internal_port_0:
+      - plt_plt_internal_port_0
+      - network.outgoing.bytes.rate
+      network.outgoing.packets.rate_plt_plt_oam_port_0:
+      - plt_plt_oam_port_0
+      - network.outgoing.packets.rate
+      network.outgoing.bytes_plt_plt_internal_port_0:
+      - plt_plt_internal_port_0
+      - network.outgoing.bytes
       disk.device.read.bytes.rate_plt:
       - plt
       - disk.device.read.bytes.rate
+      network.incoming.bytes.rate_plt_plt_oam_port_0:
+      - plt_plt_oam_port_0
+      - network.incoming.bytes.rate
+      network.incoming.bytes_plt_plt_internal_port_0:
+      - plt_plt_internal_port_0
+      - network.incoming.bytes
+      network.incoming.bytes_plt_plt_oam_port_0:
+      - plt_plt_oam_port_0
+      - network.incoming.bytes
       endpoint_plt:
       - plt
       - endpoint
       disk.read.requests_plt:
       - plt
       - disk.read.requests
-      network.outpoing.packets_plt_plt_oam_0_port:
-      - plt_plt_oam_0_port
-      - network.outpoing.packets
       disk.device.write.requests.rate_plt:
       - plt
       - disk.device.write.requests.rate
-      attachment_plt_plt_data_0_port:
-      - plt_plt_data_0_port
-      - attachment
       feature_plt:
       - plt
       - feature
       cpu_plt:
       - plt
       - cpu
+      network.incoming.packets_plt_plt_data_port_0:
+      - plt_plt_data_port_0
+      - network.incoming.packets
       disk.write.requests_plt:
       - plt
       - disk.write.requests
-      network.incoming.packets.rate_plt_plt_internal_0_port:
-      - plt_plt_internal_0_port
-      - network.incoming.packets.rate
       disk.device.write.bytes_plt:
       - plt
       - disk.device.write.bytes
-      network.outgoing.bytes_plt_plt_oam_0_port:
-      - plt_plt_oam_0_port
-      - network.outgoing.bytes
-      network.outpoing.packets_plt_plt_internal_0_port:
-      - plt_plt_internal_0_port
-      - network.outpoing.packets
-      network.incoming.bytes_plt_plt_internal_0_port:
-      - plt_plt_internal_0_port
-      - network.incoming.bytes
-      network.outgoing.packets.rate_plt_plt_oam_0_port:
-      - plt_plt_oam_0_port
-      - network.outgoing.packets.rate
-      network.incoming.bytes_plt_plt_oam_0_port:
-      - plt_plt_oam_0_port
-      - network.incoming.bytes
-      network.incoming.bytes_plt_plt_data_0_port:
-      - plt_plt_data_0_port
-      - network.incoming.bytes
-      attachment_plt_plt_internal_0_port:
-      - plt_plt_internal_0_port
-      - attachment
+      feature_plt_plt_internal_port_0:
+      - plt_plt_internal_port_0
+      - feature
+      binding_plt_plt_oam_port_0:
+      - plt_plt_oam_port_0
+      - binding
+      feature_plt_plt_oam_port_0:
+      - plt_plt_oam_port_0
+      - feature
       binding_plt:
       - plt
       - binding
-      network.incoming.bytes.rate_plt_plt_oam_0_port:
-      - plt_plt_oam_0_port
-      - network.incoming.bytes.rate
       disk.device.read.bytes_plt:
       - plt
       - disk.device.read.bytes
       disk.device.latency_plt:
       - plt
       - disk.device.latency
-      network.incoming.packets.rate_plt_plt_data_0_port:
-      - plt_plt_data_0_port
-      - network.incoming.packets.rate
-      network.outgoing.bytes_plt_plt_internal_0_port:
-      - plt_plt_internal_0_port
-      - network.outgoing.bytes
-      binding_plt_plt_internal_0_port:
-      - plt_plt_internal_0_port
+      forwarder_plt_plt_oam_port_0:
+      - plt_plt_oam_port_0
+      - forwarder
+      forwarder_plt_plt_data_port_0:
+      - plt_plt_data_port_0
+      - forwarder
+      binding_plt_plt_internal_port_0:
+      - plt_plt_internal_port_0
       - binding
-      feature_plt_plt_internal_0_port:
-      - plt_plt_internal_0_port
-      - feature
       instance_plt:
       - plt
       - instance
       disk.latency_plt:
       - plt
       - disk.latency
+      network.incoming.packets.rate_plt_plt_internal_port_0:
+      - plt_plt_internal_port_0
+      - network.incoming.packets.rate
+      network.outgoing.bytes_plt_plt_data_port_0:
+      - plt_plt_data_port_0
+      - network.outgoing.bytes
+      feature_plt_plt_data_port_0:
+      - plt_plt_data_port_0
+      - feature
       disk.write.bytes.rate_plt:
       - plt
       - disk.write.bytes.rate
+      network.outgoing.packets.rate_plt_plt_data_port_0:
+      - plt_plt_data_port_0
+      - network.outgoing.packets.rate
       disk.ephemeral.size_plt:
       - plt
       - disk.ephemeral.size
       cpu_util_plt:
       - plt
       - cpu_util
-      binding_plt_plt_oam_0_port:
-      - plt_plt_oam_0_port
-      - binding
+      attachment_plt_plt_data_port_0:
+      - plt_plt_data_port_0
+      - attachment
+      network.incoming.packets.rate_plt_plt_data_port_0:
+      - plt_plt_data_port_0
+      - network.incoming.packets.rate
+      network.incoming.packets.rate_plt_plt_oam_port_0:
+      - plt_plt_oam_port_0
+      - network.incoming.packets.rate
+      network.outgoing.bytes_plt_plt_oam_port_0:
+      - plt_plt_oam_port_0
+      - network.outgoing.bytes
       memory.usage_plt:
       - plt
       - memory.usage
-      attachment_plt_plt_oam_0_port:
-      - plt_plt_oam_0_port
-      - attachment
-      network.incoming.packets_plt_plt_oam_0_port:
-      - plt_plt_oam_0_port
-      - network.incoming.packets
+      network.outgoing.bytes.rate_plt_plt_data_port_0:
+      - plt_plt_data_port_0
+      - network.outgoing.bytes.rate
+      network.outpoing.packets_plt_plt_data_port_0:
+      - plt_plt_data_port_0
+      - network.outpoing.packets
       disk.device.capacity_plt:
       - plt
       - disk.device.capacity
-      forwarder_plt_plt_oam_0_port:
-      - plt_plt_oam_0_port
-      - forwarder
-      binding_plt_plt_data_0_port:
-      - plt_plt_data_0_port
-      - binding
       disk.device.read.requests_plt:
       - plt
       - disk.device.read.requests
+      forwarder_plt_plt_internal_port_0:
+      - plt_plt_internal_port_0
+      - forwarder
       memory.resident_plt:
       - plt
       - memory.resident
-      network.outgoing.packets.rate_plt_plt_internal_0_port:
-      - plt_plt_internal_0_port
-      - network.outgoing.packets.rate
       scalable_plt:
       - plt
       - scalable
-      network.incoming.packets.rate_plt_plt_oam_0_port:
-      - plt_plt_oam_0_port
-      - network.incoming.packets.rate
-      network.outgoing.packets.rate_plt_plt_data_0_port:
-      - plt_plt_data_0_port
-      - network.outgoing.packets.rate
-      network.incoming.bytes.rate_plt_plt_data_0_port:
-      - plt_plt_data_0_port
-      - network.incoming.bytes.rate
+      network.outpoing.packets_plt_plt_internal_port_0:
+      - plt_plt_internal_port_0
+      - network.outpoing.packets
+      network.incoming.bytes_plt_plt_data_port_0:
+      - plt_plt_data_port_0
+      - network.incoming.bytes
+      network.outgoing.bytes.rate_plt_plt_oam_port_0:
+      - plt_plt_oam_port_0
+      - network.outgoing.bytes.rate
       disk.usage_plt:
       - plt
       - disk.usage
-      feature_plt_plt_oam_0_port:
-      - plt_plt_oam_0_port
-      - feature
-      network.incoming.bytes.rate_plt_plt_internal_0_port:
-      - plt_plt_internal_0_port
-      - network.incoming.bytes.rate
+      network.incoming.packets_plt_plt_internal_port_0:
+      - plt_plt_internal_port_0
+      - network.incoming.packets
       memory_plt:
       - plt
       - memory
       disk.root.size_plt:
       - plt
       - disk.root.size
-      network.outgoing.bytes_plt_plt_data_0_port:
-      - plt_plt_data_0_port
-      - network.outgoing.bytes
       cpu.delta_plt:
       - plt
       - cpu.delta
       disk.device.write.requests_plt:
       - plt
       - disk.device.write.requests
-      feature_plt_plt_data_0_port:
-      - plt_plt_data_0_port
-      - feature
-      network.outgoing.bytes.rate_plt_plt_data_0_port:
-      - plt_plt_data_0_port
-      - network.outgoing.bytes.rate
       disk.device.read.requests.rate_plt:
       - plt
       - disk.device.read.requests.rate
-      network.outpoing.packets_plt_plt_data_0_port:
-      - plt_plt_data_0_port
-      - network.outpoing.packets
       os_plt:
       - plt
       - os
-      network.outgoing.bytes.rate_plt_plt_internal_0_port:
-      - plt_plt_internal_0_port
-      - network.outgoing.bytes.rate
-      forwarder_plt_plt_internal_0_port:
-      - plt_plt_internal_0_port
-      - forwarder
-      network.incoming.packets_plt_plt_data_0_port:
-      - plt_plt_data_0_port
-      - network.incoming.packets
       disk.allocation_plt:
       - plt
       - disk.allocation
@@ -644,31 +644,31 @@ topology_template:
       disk.write.requests.rate_plt:
       - plt
       - disk.write.requests.rate
-      forwarder_plt_plt_data_0_port:
-      - plt_plt_data_0_port
-      - forwarder
+      attachment_plt_plt_oam_port_0:
+      - plt_plt_oam_port_0
+      - attachment
     requirements:
       local_storage_plt:
       - plt
       - local_storage
-      link_plt_plt_internal_0_port:
-      - plt_plt_internal_0_port
-      - link
-      dependency_plt_plt_oam_0_port:
-      - plt_plt_oam_0_port
+      dependency_plt_plt_oam_port_0:
+      - plt_plt_oam_port_0
       - dependency
-      dependency_plt_plt_data_0_port:
-      - plt_plt_data_0_port
+      dependency_plt_plt_internal_port_0:
+      - plt_plt_internal_port_0
       - dependency
-      link_plt_plt_data_0_port:
-      - plt_plt_data_0_port
+      link_plt_plt_internal_port_0:
+      - plt_plt_internal_port_0
       - link
-      dependency_plt_plt_internal_0_port:
-      - plt_plt_internal_0_port
+      link_plt_plt_data_port_0:
+      - plt_plt_data_port_0
+      - link
+      dependency_plt_plt_data_port_0:
+      - plt_plt_data_port_0
       - dependency
-      link_plt_plt_oam_0_port:
-      - plt_plt_oam_0_port
+      link_plt_plt_oam_port_0:
+      - plt_plt_oam_port_0
       - link
       dependency_plt:
       - plt
-      - dependency
+      - dependency
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/in/hot-mog-0108-bs1271.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/in/hot-mog-0108-bs1271.yml
index c23187ef59..8f33c9f183 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/in/hot-mog-0108-bs1271.yml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/in/hot-mog-0108-bs1271.yml
@@ -46,7 +46,7 @@ resources:
       flavor: {get_param: pd_flavor_name}
       availability_zone: {get_param: availabilityzone_name}
       networks:
-        - port: {get_resource: pd01_port_0}
+        - port: {get_resource: pd_server_0_port_0}
       user_data_format:  RAW
 
   server_ps_02:
@@ -58,7 +58,7 @@ resources:
       flavor: {get_param: pd_flavor_name}
       availability_zone: {get_param: availabilityzone_name}
       networks:
-        - port: {get_resource: pd01_port_1}
+        - port: {get_resource: pd_server_1_port_0}
       user_data_format:  RAW
 
   server_ps_3:
@@ -70,18 +70,18 @@ resources:
       flavor: {get_param: pd_flavor_name}
       availability_zone: {get_param: availabilityzone_name}
       networks:
-        - port: {get_resource: pd01_port_2}
+        - port: {get_resource: pd_server_2_port_0}
       user_data_format:  RAW
 
-  pd01_port_0:
+  pd_server_0_port_0:
     type: OS::Neutron::Port
     properties:
       network: {get_resource: packet_internal_network}
-  pd01_port_1:
+  pd_server_1_port_0:
     type: OS::Neutron::Port
     properties:
       network: {get_resource: packet_internal_network}
-  pd01_port_2:
+  pd_server_2_port_0:
     type: OS::Neutron::Port
     properties:
       network: {get_resource: packet_internal_network}
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 6c0bcc4b92..d73f4cc5bf 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -8,6 +8,16 @@ node_types:
   org.openecomp.resource.abstract.nodes.pd_server:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
+      port_pd_server_port_0_subnetpoolid:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_pd_server_port_0_network:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
@@ -28,57 +38,39 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      port_pd01_port_exCP_naming:
-        type: org.openecomp.datatypes.Naming
-        required: true
-        status: SUPPORTED
-      port_pd01_port_related_networks:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
-      vm_flavor_name:
+      port_pd_server_port_0_network_role_tag:
         type: string
         required: true
         status: SUPPORTED
-      port_pd01_port_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
-        required: true
-        status: SUPPORTED
-      vm_image_name:
+      vm_flavor_name:
         type: string
         required: true
         status: SUPPORTED
-      port_pd01_port_ip_requirements:
+      port_pd_server_port_0_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
-      port_pd01_port_network:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: string
-      port_pd01_port_order:
-        type: integer
+      port_pd_server_port_0_network_role:
+        type: string
         required: true
         status: SUPPORTED
-      port_pd01_port_subnetpoolid:
+      vm_image_name:
         type: string
         required: true
         status: SUPPORTED
-      port_pd01_port_network_role:
-        type: string
+      port_pd_server_port_0_related_networks:
+        type: list
         required: true
         status: SUPPORTED
-      port_pd01_port_network_role_tag:
-        type: string
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+      port_pd_server_port_0_exCP_naming:
+        type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
-      port_pd01_port_vlan_requirements:
+      port_pd_server_port_0_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
@@ -90,6 +82,14 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_pd_server_port_0_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
+        required: true
+        status: SUPPORTED
+      port_pd_server_port_0_order:
+        type: integer
+        required: true
+        status: SUPPORTED
     requirements:
     - dependency_pd_server:
         capability: tosca.capabilities.Node
@@ -105,14 +105,14 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_pd_server_pd01_port:
+    - dependency_pd_server_pd_server_port_0:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_pd_server_pd01_port:
+    - link_pd_server_pd_server_port_0:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
@@ -130,6 +130,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      network.outgoing.packets.rate_pd_server_pd_server_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.usage_pd_server:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -148,9 +154,8 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_pd_server_pd01_port:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      forwarder_pd_server_pd_server_port_0:
+        type: org.openecomp.capabilities.Forwarder
         occurrences:
         - 1
         - UNBOUNDED
@@ -165,7 +170,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_pd_server_pd01_port:
+      network.outgoing.bytes.rate_pd_server_pd_server_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:
@@ -201,12 +206,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_pd_server_pd01_port:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
       disk.iops_pd_server:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -225,13 +224,18 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_pd_server_pd01_port:
+      vcpus_pd_server:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      vcpus_pd_server:
+      attachment_pd_server_pd_server_port_0:
+        type: tosca.capabilities.Attachment
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.incoming.bytes.rate_pd_server_pd_server_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:
@@ -254,11 +258,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_pd_server_pd01_port:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
       disk.capacity_pd_server:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -277,6 +276,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      network.incoming.bytes_pd_server_pd_server_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
       binding_pd_server:
         type: tosca.capabilities.network.Bindable
         occurrences:
@@ -299,7 +304,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      binding_pd_server_pd01_port:
+      feature_pd_server_pd_server_port_0:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      binding_pd_server_pd_server_port_0:
         type: tosca.capabilities.network.Bindable
         valid_source_types:
         - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
@@ -313,37 +323,31 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_pd_server_pd01_port:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
-      network.incoming.packets_pd_server_pd01_port:
+      disk.device.read.requests.rate_pd_server:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests.rate_pd_server:
+      disk.root.size_pd_server:
         type: org.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:
+      disk.device.read.bytes_pd_server:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes_pd_server:
+      disk.device.write.bytes_pd_server:
         type: org.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_pd_server:
+      network.incoming.packets_pd_server_pd_server_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:
@@ -368,17 +372,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_pd_server_pd01_port:
+      network.outgoing.bytes_pd_server_pd_server_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
-      forwarder_pd_server_pd01_port:
-        type: org.openecomp.capabilities.Forwarder
-        occurrences:
-        - 1
-        - UNBOUNDED
       disk.write.requests.rate_pd_server:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -397,12 +396,13 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      feature_pd_server_pd01_port:
-        type: tosca.capabilities.Node
+      disk.device.latency_pd_server:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.latency_pd_server:
+      network.incoming.packets.rate_pd_server_pd_server_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:
@@ -420,13 +420,13 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_pd_server_pd01_port:
+      disk.device.iops_pd_server:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.iops_pd_server:
+      network.outpoing.packets_pd_server_pd_server_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:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/MainServiceTemplate.yaml
index 616ac37069..3085b13d81 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/MainServiceTemplate.yaml
@@ -141,6 +141,8 @@ topology_template:
       directives:
       - substitutable
       properties:
+        port_pd_server_port_0_network:
+        - packet_internal_network
         compute_pd_server_availability_zone:
         - get_input: availabilityzone_name
         compute_pd_server_name:
@@ -149,21 +151,19 @@ topology_template:
           - 2
         vm_flavor_name:
           get_input: pd_flavor_name
-        port_pd01_port_mac_requirements:
-          mac_count_required:
-            is_required: false
-        vm_image_name:
-          get_input: diff_image_name
-        port_pd01_port_ip_requirements:
+        port_pd_server_port_0_ip_requirements:
         - ip_version: 4
           ip_count_required:
             is_required: false
           floating_ip_count_required:
             is_required: false
-        port_pd01_port_network:
-        - packet_internal_network
+        vm_image_name:
+          get_input: diff_image_name
         compute_pd_server_user_data_format:
         - RAW
+        port_pd_server_port_0_mac_requirements:
+          mac_count_required:
+            is_required: false
         service_template_filter:
           substitute_service_template: Nested_pd_serverServiceTemplate.yaml
           count: 1
@@ -173,7 +173,7 @@ topology_template:
           - service_template_filter
           - index_value
       requirements:
-      - link_pd_server_pd01_port:
+      - link_pd_server_pd_server_port_0:
           capability: tosca.capabilities.network.Linkable
           node: packet_internal_network
           relationship: tosca.relationships.network.LinksTo
@@ -182,6 +182,8 @@ topology_template:
       directives:
       - substitutable
       properties:
+        port_pd_server_port_0_network:
+        - packet_internal_network
         compute_pd_server_availability_zone:
         - get_input: availabilityzone_name
         compute_pd_server_name:
@@ -190,21 +192,19 @@ topology_template:
           - 0
         vm_flavor_name:
           get_input: pd_flavor_name
-        port_pd01_port_mac_requirements:
-          mac_count_required:
-            is_required: false
-        vm_image_name:
-          get_input: pd_image_name
-        port_pd01_port_ip_requirements:
+        port_pd_server_port_0_ip_requirements:
         - ip_version: 4
           ip_count_required:
             is_required: false
           floating_ip_count_required:
             is_required: false
-        port_pd01_port_network:
-        - packet_internal_network
+        vm_image_name:
+          get_input: pd_image_name
         compute_pd_server_user_data_format:
         - RAW
+        port_pd_server_port_0_mac_requirements:
+          mac_count_required:
+            is_required: false
         service_template_filter:
           substitute_service_template: Nested_pd_serverServiceTemplate.yaml
           count: 1
@@ -214,7 +214,7 @@ topology_template:
           - service_template_filter
           - index_value
       requirements:
-      - link_pd_server_pd01_port:
+      - link_pd_server_pd_server_port_0:
           capability: tosca.capabilities.network.Linkable
           node: packet_internal_network
           relationship: tosca.relationships.network.LinksTo
@@ -223,6 +223,8 @@ topology_template:
       directives:
       - substitutable
       properties:
+        port_pd_server_port_0_network:
+        - packet_internal_network
         compute_pd_server_availability_zone:
         - get_input: availabilityzone_name
         compute_pd_server_name:
@@ -231,21 +233,19 @@ topology_template:
           - 1
         vm_flavor_name:
           get_input: pd_flavor_name
-        port_pd01_port_mac_requirements:
-          mac_count_required:
-            is_required: false
-        vm_image_name:
-          get_input: pd_image_name
-        port_pd01_port_ip_requirements:
+        port_pd_server_port_0_ip_requirements:
         - ip_version: 4
           ip_count_required:
             is_required: false
           floating_ip_count_required:
             is_required: false
-        port_pd01_port_network:
-        - packet_internal_network
+        vm_image_name:
+          get_input: pd_image_name
         compute_pd_server_user_data_format:
         - RAW
+        port_pd_server_port_0_mac_requirements:
+          mac_count_required:
+            is_required: false
         service_template_filter:
           substitute_service_template: Nested_pd_serverServiceTemplate.yaml
           count: 1
@@ -255,7 +255,7 @@ topology_template:
           - service_template_filter
           - index_value
       requirements:
-      - link_pd_server_pd01_port:
+      - link_pd_server_pd_server_port_0:
           capability: tosca.capabilities.network.Linkable
           node: packet_internal_network
           relationship: tosca.relationships.network.LinksTo
@@ -269,4 +269,4 @@ topology_template:
       - packet_internal_network
       - abstract_pd_server_0
       - abstract_pd_server_1
-      - abstract_pd_server_2
+      - abstract_pd_server_2
\ 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/catalogInstances/threeComputesSameTypeDiffImageName/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/Nested_pd_serverServiceTemplate.yaml
index 2d01270aaf..6b19a99ee9 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/Nested_pd_serverServiceTemplate.yaml
@@ -11,6 +11,14 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
+    port_pd_server_port_0_subnetpoolid:
+      type: string
+      required: true
+    port_pd_server_port_0_network:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     index_value:
       type: integer
       description: Index value of this substitution service template runtime instance
@@ -28,46 +36,32 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    port_pd01_port_exCP_naming:
-      type: org.openecomp.datatypes.Naming
-      required: true
-    port_pd01_port_related_networks:
-      type: list
-      required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
-    vm_flavor_name:
+    port_pd_server_port_0_network_role_tag:
       type: string
       required: true
-    port_pd01_port_mac_requirements:
-      type: org.openecomp.datatypes.network.MacRequirements
-      required: true
-    vm_image_name:
+    vm_flavor_name:
       type: string
       required: true
-    port_pd01_port_ip_requirements:
+    port_pd_server_port_0_ip_requirements:
       type: list
       required: true
       entry_schema:
         type: org.openecomp.datatypes.network.IpRequirements
-    port_pd01_port_network:
-      type: list
-      required: true
-      entry_schema:
-        type: string
-    port_pd01_port_order:
-      type: integer
-      required: true
-    port_pd01_port_subnetpoolid:
+    port_pd_server_port_0_network_role:
       type: string
       required: true
-    port_pd01_port_network_role:
+    vm_image_name:
       type: string
       required: true
-    port_pd01_port_network_role_tag:
-      type: string
+    port_pd_server_port_0_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+    port_pd_server_port_0_exCP_naming:
+      type: org.openecomp.datatypes.Naming
       required: true
-    port_pd01_port_vlan_requirements:
+    port_pd_server_port_0_vlan_requirements:
       type: list
       required: true
       entry_schema:
@@ -77,6 +71,12 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_pd_server_port_0_mac_requirements:
+      type: org.openecomp.datatypes.network.MacRequirements
+      required: true
+    port_pd_server_port_0_order:
+      type: integer
+      required: true
   node_templates:
     pd_server:
       type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server
@@ -97,31 +97,31 @@ topology_template:
           get_input:
           - compute_pd_server_user_data_format
           - index_value
-    pd_server_pd01_port:
+    pd_server_pd_server_port_0:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         exCP_naming:
-          get_input: port_pd01_port_exCP_naming
+          get_input: port_pd_server_port_0_exCP_naming
         vlan_requirements:
-          get_input: port_pd01_port_vlan_requirements
+          get_input: port_pd_server_port_0_vlan_requirements
         subinterface_indicator: false
         related_networks:
-          get_input: port_pd01_port_related_networks
+          get_input: port_pd_server_port_0_related_networks
         ip_requirements:
-          get_input: port_pd01_port_ip_requirements
+          get_input: port_pd_server_port_0_ip_requirements
         network_role_tag:
-          get_input: port_pd01_port_network_role_tag
+          get_input: port_pd_server_port_0_network_role_tag
         mac_requirements:
-          get_input: port_pd01_port_mac_requirements
+          get_input: port_pd_server_port_0_mac_requirements
         order:
-          get_input: port_pd01_port_order
+          get_input: port_pd_server_port_0_order
         network_role:
-          get_input: port_pd01_port_network_role
+          get_input: port_pd_server_port_0_network_role
         subnetpoolid:
-          get_input: port_pd01_port_subnetpoolid
+          get_input: port_pd_server_port_0_subnetpoolid
         network:
           get_input:
-          - port_pd01_port_network
+          - port_pd_server_port_0_network
           - index_value
       requirements:
       - binding:
@@ -137,6 +137,9 @@ topology_template:
       disk.read.bytes.rate_pd_server:
       - pd_server
       - disk.read.bytes.rate
+      network.outgoing.packets.rate_pd_server_pd_server_port_0:
+      - pd_server_pd_server_port_0
+      - network.outgoing.packets.rate
       memory.usage_pd_server:
       - pd_server
       - memory.usage
@@ -146,18 +149,18 @@ topology_template:
       disk.device.usage_pd_server:
       - pd_server
       - disk.device.usage
-      network.outgoing.packets.rate_pd_server_pd01_port:
-      - pd_server_pd01_port
-      - network.outgoing.packets.rate
+      forwarder_pd_server_pd_server_port_0:
+      - pd_server_pd_server_port_0
+      - forwarder
       os_pd_server:
       - pd_server
       - os
       disk.write.bytes.rate_pd_server:
       - pd_server
       - disk.write.bytes.rate
-      network.incoming.bytes_pd_server_pd01_port:
-      - pd_server_pd01_port
-      - network.incoming.bytes
+      network.outgoing.bytes.rate_pd_server_pd_server_port_0:
+      - pd_server_pd_server_port_0
+      - network.outgoing.bytes.rate
       cpu_pd_server:
       - pd_server
       - cpu
@@ -173,9 +176,6 @@ topology_template:
       disk.device.read.bytes.rate_pd_server:
       - pd_server
       - disk.device.read.bytes.rate
-      network.outgoing.bytes_pd_server_pd01_port:
-      - pd_server_pd01_port
-      - network.outgoing.bytes
       disk.iops_pd_server:
       - pd_server
       - disk.iops
@@ -185,12 +185,15 @@ topology_template:
       cpu.delta_pd_server:
       - pd_server
       - cpu.delta
-      network.incoming.packets.rate_pd_server_pd01_port:
-      - pd_server_pd01_port
-      - network.incoming.packets.rate
       vcpus_pd_server:
       - pd_server
       - vcpus
+      attachment_pd_server_pd_server_port_0:
+      - pd_server_pd_server_port_0
+      - attachment
+      network.incoming.bytes.rate_pd_server_pd_server_port_0:
+      - pd_server_pd_server_port_0
+      - network.incoming.bytes.rate
       disk.device.write.bytes.rate_pd_server:
       - pd_server
       - disk.device.write.bytes.rate
@@ -200,9 +203,6 @@ topology_template:
       endpoint_pd_server:
       - pd_server
       - endpoint
-      attachment_pd_server_pd01_port:
-      - pd_server_pd01_port
-      - attachment
       disk.capacity_pd_server:
       - pd_server
       - disk.capacity
@@ -212,6 +212,9 @@ topology_template:
       disk.allocation_pd_server:
       - pd_server
       - disk.allocation
+      network.incoming.bytes_pd_server_pd_server_port_0:
+      - pd_server_pd_server_port_0
+      - network.incoming.bytes
       binding_pd_server:
       - pd_server
       - binding
@@ -224,18 +227,15 @@ topology_template:
       disk.usage_pd_server:
       - pd_server
       - disk.usage
-      binding_pd_server_pd01_port:
-      - pd_server_pd01_port
+      feature_pd_server_pd_server_port_0:
+      - pd_server_pd_server_port_0
+      - feature
+      binding_pd_server_pd_server_port_0:
+      - pd_server_pd_server_port_0
       - binding
       disk.write.bytes_pd_server:
       - pd_server
       - disk.write.bytes
-      network.incoming.bytes.rate_pd_server_pd01_port:
-      - pd_server_pd01_port
-      - network.incoming.bytes.rate
-      network.incoming.packets_pd_server_pd01_port:
-      - pd_server_pd01_port
-      - network.incoming.packets
       disk.device.read.requests.rate_pd_server:
       - pd_server
       - disk.device.read.requests.rate
@@ -248,6 +248,9 @@ topology_template:
       disk.device.write.bytes_pd_server:
       - pd_server
       - disk.device.write.bytes
+      network.incoming.packets_pd_server_pd_server_port_0:
+      - pd_server_pd_server_port_0
+      - network.incoming.packets
       disk.device.read.requests_pd_server:
       - pd_server
       - disk.device.read.requests
@@ -257,12 +260,9 @@ topology_template:
       host_pd_server:
       - pd_server
       - host
-      network.outpoing.packets_pd_server_pd01_port:
-      - pd_server_pd01_port
-      - network.outpoing.packets
-      forwarder_pd_server_pd01_port:
-      - pd_server_pd01_port
-      - forwarder
+      network.outgoing.bytes_pd_server_pd_server_port_0:
+      - pd_server_pd_server_port_0
+      - network.outgoing.bytes
       disk.write.requests.rate_pd_server:
       - pd_server
       - disk.write.requests.rate
@@ -272,34 +272,34 @@ topology_template:
       disk.write.requests_pd_server:
       - pd_server
       - disk.write.requests
-      feature_pd_server_pd01_port:
-      - pd_server_pd01_port
-      - feature
       disk.device.latency_pd_server:
       - pd_server
       - disk.device.latency
+      network.incoming.packets.rate_pd_server_pd_server_port_0:
+      - pd_server_pd_server_port_0
+      - network.incoming.packets.rate
       disk.latency_pd_server:
       - pd_server
       - disk.latency
       disk.device.capacity_pd_server:
       - pd_server
       - disk.device.capacity
-      network.outgoing.bytes.rate_pd_server_pd01_port:
-      - pd_server_pd01_port
-      - network.outgoing.bytes.rate
       disk.device.iops_pd_server:
       - pd_server
       - disk.device.iops
+      network.outpoing.packets_pd_server_pd_server_port_0:
+      - pd_server_pd_server_port_0
+      - network.outpoing.packets
     requirements:
       local_storage_pd_server:
       - pd_server
       - local_storage
-      link_pd_server_pd01_port:
-      - pd_server_pd01_port
+      link_pd_server_pd_server_port_0:
+      - pd_server_pd_server_port_0
       - link
-      dependency_pd_server_pd01_port:
-      - pd_server_pd01_port
-      - dependency
       dependency_pd_server:
       - pd_server
+      - dependency
+      dependency_pd_server_pd_server_port_0:
+      - pd_server_pd_server_port_0
       - 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/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/in/hot-mog-0108-bs1271.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/in/hot-mog-0108-bs1271.yml
index b5cd4ffd61..717449cab2 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/in/hot-mog-0108-bs1271.yml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/in/hot-mog-0108-bs1271.yml
@@ -90,7 +90,7 @@ resources:
       flavor: {get_attr: [network_policy_server, name]}
       availability_zone: {get_param: availabilityzone_name}
       networks:
-        - port: {get_resource: pd01_port_0}
+        - port: {get_resource: pd_server_0_port_0}
       user_data_format:  RAW
 
   server_ps_02:
@@ -102,7 +102,7 @@ resources:
       flavor: {get_attr: [network_policy_server, name]}
       availability_zone: {get_param: availabilityzone_name}
       networks:
-        - port: {get_resource: pd01_port_1}
+        - port: {get_resource: pd_server_1_port_0}
       user_data_format:  RAW
 
   server_ps_03:
@@ -114,18 +114,18 @@ resources:
       flavor: {get_attr: [network_policy_server, name]}
       availability_zone: {get_attr: [server_ps_01, show]}
       networks:
-        - port: {get_resource: pd01_port_2}
+        - port: {get_resource: pd_server_2_port_0}
       user_data_format:  RAW
 
-  pd01_port_0:
+  pd_server_0_port_0:
     type: OS::Neutron::Port
     properties:
       network: {get_param: oam_net_name}
-  pd01_port_1:
+  pd_server_1_port_0:
     type: OS::Neutron::Port
     properties:
       network: {get_param: oam_net_name}
-  pd01_port_2:
+  pd_server_2_port_0:
     type: OS::Neutron::Port
     properties:
       network: {get_param: oam_net_name}
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 6c0bcc4b92..d73f4cc5bf 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -8,6 +8,16 @@ node_types:
   org.openecomp.resource.abstract.nodes.pd_server:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
+      port_pd_server_port_0_subnetpoolid:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_pd_server_port_0_network:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
@@ -28,57 +38,39 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      port_pd01_port_exCP_naming:
-        type: org.openecomp.datatypes.Naming
-        required: true
-        status: SUPPORTED
-      port_pd01_port_related_networks:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
-      vm_flavor_name:
+      port_pd_server_port_0_network_role_tag:
         type: string
         required: true
         status: SUPPORTED
-      port_pd01_port_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
-        required: true
-        status: SUPPORTED
-      vm_image_name:
+      vm_flavor_name:
         type: string
         required: true
         status: SUPPORTED
-      port_pd01_port_ip_requirements:
+      port_pd_server_port_0_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
-      port_pd01_port_network:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: string
-      port_pd01_port_order:
-        type: integer
+      port_pd_server_port_0_network_role:
+        type: string
         required: true
         status: SUPPORTED
-      port_pd01_port_subnetpoolid:
+      vm_image_name:
         type: string
         required: true
         status: SUPPORTED
-      port_pd01_port_network_role:
-        type: string
+      port_pd_server_port_0_related_networks:
+        type: list
         required: true
         status: SUPPORTED
-      port_pd01_port_network_role_tag:
-        type: string
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+      port_pd_server_port_0_exCP_naming:
+        type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
-      port_pd01_port_vlan_requirements:
+      port_pd_server_port_0_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
@@ -90,6 +82,14 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_pd_server_port_0_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
+        required: true
+        status: SUPPORTED
+      port_pd_server_port_0_order:
+        type: integer
+        required: true
+        status: SUPPORTED
     requirements:
     - dependency_pd_server:
         capability: tosca.capabilities.Node
@@ -105,14 +105,14 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_pd_server_pd01_port:
+    - dependency_pd_server_pd_server_port_0:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_pd_server_pd01_port:
+    - link_pd_server_pd_server_port_0:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
@@ -130,6 +130,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      network.outgoing.packets.rate_pd_server_pd_server_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.usage_pd_server:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -148,9 +154,8 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_pd_server_pd01_port:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      forwarder_pd_server_pd_server_port_0:
+        type: org.openecomp.capabilities.Forwarder
         occurrences:
         - 1
         - UNBOUNDED
@@ -165,7 +170,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_pd_server_pd01_port:
+      network.outgoing.bytes.rate_pd_server_pd_server_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:
@@ -201,12 +206,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_pd_server_pd01_port:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
       disk.iops_pd_server:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -225,13 +224,18 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_pd_server_pd01_port:
+      vcpus_pd_server:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      vcpus_pd_server:
+      attachment_pd_server_pd_server_port_0:
+        type: tosca.capabilities.Attachment
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.incoming.bytes.rate_pd_server_pd_server_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:
@@ -254,11 +258,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_pd_server_pd01_port:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
       disk.capacity_pd_server:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -277,6 +276,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      network.incoming.bytes_pd_server_pd_server_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
       binding_pd_server:
         type: tosca.capabilities.network.Bindable
         occurrences:
@@ -299,7 +304,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      binding_pd_server_pd01_port:
+      feature_pd_server_pd_server_port_0:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      binding_pd_server_pd_server_port_0:
         type: tosca.capabilities.network.Bindable
         valid_source_types:
         - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
@@ -313,37 +323,31 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_pd_server_pd01_port:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
-      network.incoming.packets_pd_server_pd01_port:
+      disk.device.read.requests.rate_pd_server:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests.rate_pd_server:
+      disk.root.size_pd_server:
         type: org.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:
+      disk.device.read.bytes_pd_server:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes_pd_server:
+      disk.device.write.bytes_pd_server:
         type: org.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_pd_server:
+      network.incoming.packets_pd_server_pd_server_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:
@@ -368,17 +372,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_pd_server_pd01_port:
+      network.outgoing.bytes_pd_server_pd_server_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
-      forwarder_pd_server_pd01_port:
-        type: org.openecomp.capabilities.Forwarder
-        occurrences:
-        - 1
-        - UNBOUNDED
       disk.write.requests.rate_pd_server:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -397,12 +396,13 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      feature_pd_server_pd01_port:
-        type: tosca.capabilities.Node
+      disk.device.latency_pd_server:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.latency_pd_server:
+      network.incoming.packets.rate_pd_server_pd_server_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:
@@ -420,13 +420,13 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_pd_server_pd01_port:
+      disk.device.iops_pd_server:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.iops_pd_server:
+      network.outpoing.packets_pd_server_pd_server_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:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/MainServiceTemplate.yaml
index 28836651f6..14c0261606 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/MainServiceTemplate.yaml
@@ -323,6 +323,8 @@ topology_template:
       directives:
       - substitutable
       properties:
+        port_pd_server_port_0_network:
+        - get_input: oam_net_name
         compute_pd_server_availability_zone:
         - get_attribute:
           - abstract_pd_server_0
@@ -331,26 +333,24 @@ topology_template:
         - get_input:
           - pd_server_names
           - 2
+        port_pd_server_port_0_network_role_tag: oam
         vm_flavor_name:
           get_attribute:
           - network_policy_server
           - name
-        port_pd01_port_mac_requirements:
-          mac_count_required:
-            is_required: false
-        vm_image_name:
-          get_input: pd_image_name
-        port_pd01_port_ip_requirements:
+        port_pd_server_port_0_ip_requirements:
         - ip_version: 4
           ip_count_required:
             is_required: false
           floating_ip_count_required:
             is_required: false
-        port_pd01_port_network:
-        - get_input: oam_net_name
-        port_pd01_port_network_role_tag: oam
+        vm_image_name:
+          get_input: pd_image_name
         compute_pd_server_user_data_format:
         - RAW
+        port_pd_server_port_0_mac_requirements:
+          mac_count_required:
+            is_required: false
         service_template_filter:
           substitute_service_template: Nested_pd_serverServiceTemplate.yaml
           count: 1
@@ -369,32 +369,32 @@ topology_template:
       directives:
       - substitutable
       properties:
+        port_pd_server_port_0_network:
+        - get_input: oam_net_name
         compute_pd_server_availability_zone:
         - get_input: availabilityzone_name
         compute_pd_server_name:
         - get_input:
           - pd_server_names
           - 0
+        port_pd_server_port_0_network_role_tag: oam
         vm_flavor_name:
           get_attribute:
           - network_policy_server
           - name
-        port_pd01_port_mac_requirements:
-          mac_count_required:
-            is_required: false
-        vm_image_name:
-          get_input: pd_image_name
-        port_pd01_port_ip_requirements:
+        port_pd_server_port_0_ip_requirements:
         - ip_version: 4
           ip_count_required:
             is_required: false
           floating_ip_count_required:
             is_required: false
-        port_pd01_port_network:
-        - get_input: oam_net_name
-        port_pd01_port_network_role_tag: oam
+        vm_image_name:
+          get_input: pd_image_name
         compute_pd_server_user_data_format:
         - RAW
+        port_pd_server_port_0_mac_requirements:
+          mac_count_required:
+            is_required: false
         service_template_filter:
           substitute_service_template: Nested_pd_serverServiceTemplate.yaml
           count: 1
@@ -408,32 +408,32 @@ topology_template:
       directives:
       - substitutable
       properties:
+        port_pd_server_port_0_network:
+        - get_input: oam_net_name
         compute_pd_server_availability_zone:
         - get_input: availabilityzone_name
         compute_pd_server_name:
         - get_input:
           - pd_server_names
           - 1
+        port_pd_server_port_0_network_role_tag: oam
         vm_flavor_name:
           get_attribute:
           - network_policy_server
           - name
-        port_pd01_port_mac_requirements:
-          mac_count_required:
-            is_required: false
-        vm_image_name:
-          get_input: pd_image_name
-        port_pd01_port_ip_requirements:
+        port_pd_server_port_0_ip_requirements:
         - ip_version: 4
           ip_count_required:
             is_required: false
           floating_ip_count_required:
             is_required: false
-        port_pd01_port_network:
-        - get_input: oam_net_name
-        port_pd01_port_network_role_tag: oam
+        vm_image_name:
+          get_input: pd_image_name
         compute_pd_server_user_data_format:
         - RAW
+        port_pd_server_port_0_mac_requirements:
+          mac_count_required:
+            is_required: false
         service_template_filter:
           substitute_service_template: Nested_pd_serverServiceTemplate.yaml
           count: 1
@@ -452,4 +452,4 @@ topology_template:
       - network_policy_server
       - abstract_pd_server_0
       - abstract_pd_server_1
-      - abstract_pd_server_2
+      - abstract_pd_server_2
\ 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/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/Nested_pd_serverServiceTemplate.yaml
index 2d01270aaf..6b19a99ee9 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/Nested_pd_serverServiceTemplate.yaml
@@ -11,6 +11,14 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
+    port_pd_server_port_0_subnetpoolid:
+      type: string
+      required: true
+    port_pd_server_port_0_network:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     index_value:
       type: integer
       description: Index value of this substitution service template runtime instance
@@ -28,46 +36,32 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    port_pd01_port_exCP_naming:
-      type: org.openecomp.datatypes.Naming
-      required: true
-    port_pd01_port_related_networks:
-      type: list
-      required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
-    vm_flavor_name:
+    port_pd_server_port_0_network_role_tag:
       type: string
       required: true
-    port_pd01_port_mac_requirements:
-      type: org.openecomp.datatypes.network.MacRequirements
-      required: true
-    vm_image_name:
+    vm_flavor_name:
       type: string
       required: true
-    port_pd01_port_ip_requirements:
+    port_pd_server_port_0_ip_requirements:
       type: list
       required: true
       entry_schema:
         type: org.openecomp.datatypes.network.IpRequirements
-    port_pd01_port_network:
-      type: list
-      required: true
-      entry_schema:
-        type: string
-    port_pd01_port_order:
-      type: integer
-      required: true
-    port_pd01_port_subnetpoolid:
+    port_pd_server_port_0_network_role:
       type: string
       required: true
-    port_pd01_port_network_role:
+    vm_image_name:
       type: string
       required: true
-    port_pd01_port_network_role_tag:
-      type: string
+    port_pd_server_port_0_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+    port_pd_server_port_0_exCP_naming:
+      type: org.openecomp.datatypes.Naming
       required: true
-    port_pd01_port_vlan_requirements:
+    port_pd_server_port_0_vlan_requirements:
       type: list
       required: true
       entry_schema:
@@ -77,6 +71,12 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_pd_server_port_0_mac_requirements:
+      type: org.openecomp.datatypes.network.MacRequirements
+      required: true
+    port_pd_server_port_0_order:
+      type: integer
+      required: true
   node_templates:
     pd_server:
       type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server
@@ -97,31 +97,31 @@ topology_template:
           get_input:
           - compute_pd_server_user_data_format
           - index_value
-    pd_server_pd01_port:
+    pd_server_pd_server_port_0:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         exCP_naming:
-          get_input: port_pd01_port_exCP_naming
+          get_input: port_pd_server_port_0_exCP_naming
         vlan_requirements:
-          get_input: port_pd01_port_vlan_requirements
+          get_input: port_pd_server_port_0_vlan_requirements
         subinterface_indicator: false
         related_networks:
-          get_input: port_pd01_port_related_networks
+          get_input: port_pd_server_port_0_related_networks
         ip_requirements:
-          get_input: port_pd01_port_ip_requirements
+          get_input: port_pd_server_port_0_ip_requirements
         network_role_tag:
-          get_input: port_pd01_port_network_role_tag
+          get_input: port_pd_server_port_0_network_role_tag
         mac_requirements:
-          get_input: port_pd01_port_mac_requirements
+          get_input: port_pd_server_port_0_mac_requirements
         order:
-          get_input: port_pd01_port_order
+          get_input: port_pd_server_port_0_order
         network_role:
-          get_input: port_pd01_port_network_role
+          get_input: port_pd_server_port_0_network_role
         subnetpoolid:
-          get_input: port_pd01_port_subnetpoolid
+          get_input: port_pd_server_port_0_subnetpoolid
         network:
           get_input:
-          - port_pd01_port_network
+          - port_pd_server_port_0_network
           - index_value
       requirements:
       - binding:
@@ -137,6 +137,9 @@ topology_template:
       disk.read.bytes.rate_pd_server:
       - pd_server
       - disk.read.bytes.rate
+      network.outgoing.packets.rate_pd_server_pd_server_port_0:
+      - pd_server_pd_server_port_0
+      - network.outgoing.packets.rate
       memory.usage_pd_server:
       - pd_server
       - memory.usage
@@ -146,18 +149,18 @@ topology_template:
       disk.device.usage_pd_server:
       - pd_server
       - disk.device.usage
-      network.outgoing.packets.rate_pd_server_pd01_port:
-      - pd_server_pd01_port
-      - network.outgoing.packets.rate
+      forwarder_pd_server_pd_server_port_0:
+      - pd_server_pd_server_port_0
+      - forwarder
       os_pd_server:
       - pd_server
       - os
       disk.write.bytes.rate_pd_server:
       - pd_server
       - disk.write.bytes.rate
-      network.incoming.bytes_pd_server_pd01_port:
-      - pd_server_pd01_port
-      - network.incoming.bytes
+      network.outgoing.bytes.rate_pd_server_pd_server_port_0:
+      - pd_server_pd_server_port_0
+      - network.outgoing.bytes.rate
       cpu_pd_server:
       - pd_server
       - cpu
@@ -173,9 +176,6 @@ topology_template:
       disk.device.read.bytes.rate_pd_server:
       - pd_server
       - disk.device.read.bytes.rate
-      network.outgoing.bytes_pd_server_pd01_port:
-      - pd_server_pd01_port
-      - network.outgoing.bytes
       disk.iops_pd_server:
       - pd_server
       - disk.iops
@@ -185,12 +185,15 @@ topology_template:
       cpu.delta_pd_server:
       - pd_server
       - cpu.delta
-      network.incoming.packets.rate_pd_server_pd01_port:
-      - pd_server_pd01_port
-      - network.incoming.packets.rate
       vcpus_pd_server:
       - pd_server
       - vcpus
+      attachment_pd_server_pd_server_port_0:
+      - pd_server_pd_server_port_0
+      - attachment
+      network.incoming.bytes.rate_pd_server_pd_server_port_0:
+      - pd_server_pd_server_port_0
+      - network.incoming.bytes.rate
       disk.device.write.bytes.rate_pd_server:
       - pd_server
       - disk.device.write.bytes.rate
@@ -200,9 +203,6 @@ topology_template:
       endpoint_pd_server:
       - pd_server
       - endpoint
-      attachment_pd_server_pd01_port:
-      - pd_server_pd01_port
-      - attachment
       disk.capacity_pd_server:
       - pd_server
       - disk.capacity
@@ -212,6 +212,9 @@ topology_template:
       disk.allocation_pd_server:
       - pd_server
       - disk.allocation
+      network.incoming.bytes_pd_server_pd_server_port_0:
+      - pd_server_pd_server_port_0
+      - network.incoming.bytes
       binding_pd_server:
       - pd_server
       - binding
@@ -224,18 +227,15 @@ topology_template:
       disk.usage_pd_server:
       - pd_server
       - disk.usage
-      binding_pd_server_pd01_port:
-      - pd_server_pd01_port
+      feature_pd_server_pd_server_port_0:
+      - pd_server_pd_server_port_0
+      - feature
+      binding_pd_server_pd_server_port_0:
+      - pd_server_pd_server_port_0
       - binding
       disk.write.bytes_pd_server:
       - pd_server
       - disk.write.bytes
-      network.incoming.bytes.rate_pd_server_pd01_port:
-      - pd_server_pd01_port
-      - network.incoming.bytes.rate
-      network.incoming.packets_pd_server_pd01_port:
-      - pd_server_pd01_port
-      - network.incoming.packets
       disk.device.read.requests.rate_pd_server:
       - pd_server
       - disk.device.read.requests.rate
@@ -248,6 +248,9 @@ topology_template:
       disk.device.write.bytes_pd_server:
       - pd_server
       - disk.device.write.bytes
+      network.incoming.packets_pd_server_pd_server_port_0:
+      - pd_server_pd_server_port_0
+      - network.incoming.packets
       disk.device.read.requests_pd_server:
       - pd_server
       - disk.device.read.requests
@@ -257,12 +260,9 @@ topology_template:
       host_pd_server:
       - pd_server
       - host
-      network.outpoing.packets_pd_server_pd01_port:
-      - pd_server_pd01_port
-      - network.outpoing.packets
-      forwarder_pd_server_pd01_port:
-      - pd_server_pd01_port
-      - forwarder
+      network.outgoing.bytes_pd_server_pd_server_port_0:
+      - pd_server_pd_server_port_0
+      - network.outgoing.bytes
       disk.write.requests.rate_pd_server:
       - pd_server
       - disk.write.requests.rate
@@ -272,34 +272,34 @@ topology_template:
       disk.write.requests_pd_server:
       - pd_server
       - disk.write.requests
-      feature_pd_server_pd01_port:
-      - pd_server_pd01_port
-      - feature
       disk.device.latency_pd_server:
       - pd_server
       - disk.device.latency
+      network.incoming.packets.rate_pd_server_pd_server_port_0:
+      - pd_server_pd_server_port_0
+      - network.incoming.packets.rate
       disk.latency_pd_server:
       - pd_server
       - disk.latency
       disk.device.capacity_pd_server:
       - pd_server
       - disk.device.capacity
-      network.outgoing.bytes.rate_pd_server_pd01_port:
-      - pd_server_pd01_port
-      - network.outgoing.bytes.rate
       disk.device.iops_pd_server:
       - pd_server
       - disk.device.iops
+      network.outpoing.packets_pd_server_pd_server_port_0:
+      - pd_server_pd_server_port_0
+      - network.outpoing.packets
     requirements:
       local_storage_pd_server:
       - pd_server
       - local_storage
-      link_pd_server_pd01_port:
-      - pd_server_pd01_port
+      link_pd_server_pd_server_port_0:
+      - pd_server_pd_server_port_0
       - link
-      dependency_pd_server_pd01_port:
-      - pd_server_pd01_port
-      - dependency
       dependency_pd_server:
       - pd_server
+      - dependency
+      dependency_pd_server_pd_server_port_0:
+      - pd_server_pd_server_port_0
       - 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/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/in/hot-mog-0108-bs1271.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/in/hot-mog-0108-bs1271.yml
index 836d3d2bdd..7b84aee9fd 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/in/hot-mog-0108-bs1271.yml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/in/hot-mog-0108-bs1271.yml
@@ -42,7 +42,7 @@ resources:
       flavor: {get_param: pd_flavor_name}
       availability_zone: {get_param: availabilityzone_name}
       networks:
-        - port: {get_resource: pd01_port_0}
+        - port: {get_resource: pd_server_0_port_0}
       user_data_format:  RAW
 
   server_ps_02:
@@ -54,7 +54,7 @@ resources:
       flavor: {get_param: pd_flavor_name}
       availability_zone: {get_param: availabilityzone_name}
       networks:
-        - port: {get_resource: pd01_port_1}
+        - port: {get_resource: pd_server_1_port_0}
       user_data_format:  RAW
 
   server_ps_3:
@@ -66,18 +66,18 @@ resources:
       flavor: {get_param: pd_flavor_name}
       availability_zone: {get_param: availabilityzone_name}
       networks:
-        - port: {get_resource: pd01_port_2}
+        - port: {get_resource: pd_server_2_port_0}
       user_data_format:  RAW
 
-  pd01_port_0:
+  pd_server_0_port_0:
     type: OS::Neutron::Port
     properties:
       network: {get_resource: packet_internal_network}
-  pd01_port_1:
+  pd_server_1_port_0:
     type: OS::Neutron::Port
     properties:
       network: {get_resource: packet_internal_network}
-  pd01_port_2:
+  pd_server_2_port_0:
     type: OS::Neutron::Port
     properties:
       network: {get_resource: packet_external_network}
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 6c0bcc4b92..d73f4cc5bf 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -8,6 +8,16 @@ node_types:
   org.openecomp.resource.abstract.nodes.pd_server:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
+      port_pd_server_port_0_subnetpoolid:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_pd_server_port_0_network:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
@@ -28,57 +38,39 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      port_pd01_port_exCP_naming:
-        type: org.openecomp.datatypes.Naming
-        required: true
-        status: SUPPORTED
-      port_pd01_port_related_networks:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
-      vm_flavor_name:
+      port_pd_server_port_0_network_role_tag:
         type: string
         required: true
         status: SUPPORTED
-      port_pd01_port_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
-        required: true
-        status: SUPPORTED
-      vm_image_name:
+      vm_flavor_name:
         type: string
         required: true
         status: SUPPORTED
-      port_pd01_port_ip_requirements:
+      port_pd_server_port_0_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
-      port_pd01_port_network:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: string
-      port_pd01_port_order:
-        type: integer
+      port_pd_server_port_0_network_role:
+        type: string
         required: true
         status: SUPPORTED
-      port_pd01_port_subnetpoolid:
+      vm_image_name:
         type: string
         required: true
         status: SUPPORTED
-      port_pd01_port_network_role:
-        type: string
+      port_pd_server_port_0_related_networks:
+        type: list
         required: true
         status: SUPPORTED
-      port_pd01_port_network_role_tag:
-        type: string
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+      port_pd_server_port_0_exCP_naming:
+        type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
-      port_pd01_port_vlan_requirements:
+      port_pd_server_port_0_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
@@ -90,6 +82,14 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_pd_server_port_0_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
+        required: true
+        status: SUPPORTED
+      port_pd_server_port_0_order:
+        type: integer
+        required: true
+        status: SUPPORTED
     requirements:
     - dependency_pd_server:
         capability: tosca.capabilities.Node
@@ -105,14 +105,14 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_pd_server_pd01_port:
+    - dependency_pd_server_pd_server_port_0:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_pd_server_pd01_port:
+    - link_pd_server_pd_server_port_0:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
@@ -130,6 +130,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      network.outgoing.packets.rate_pd_server_pd_server_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.usage_pd_server:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -148,9 +154,8 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_pd_server_pd01_port:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      forwarder_pd_server_pd_server_port_0:
+        type: org.openecomp.capabilities.Forwarder
         occurrences:
         - 1
         - UNBOUNDED
@@ -165,7 +170,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_pd_server_pd01_port:
+      network.outgoing.bytes.rate_pd_server_pd_server_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:
@@ -201,12 +206,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_pd_server_pd01_port:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
       disk.iops_pd_server:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -225,13 +224,18 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_pd_server_pd01_port:
+      vcpus_pd_server:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      vcpus_pd_server:
+      attachment_pd_server_pd_server_port_0:
+        type: tosca.capabilities.Attachment
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.incoming.bytes.rate_pd_server_pd_server_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:
@@ -254,11 +258,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_pd_server_pd01_port:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
       disk.capacity_pd_server:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -277,6 +276,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      network.incoming.bytes_pd_server_pd_server_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
       binding_pd_server:
         type: tosca.capabilities.network.Bindable
         occurrences:
@@ -299,7 +304,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      binding_pd_server_pd01_port:
+      feature_pd_server_pd_server_port_0:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      binding_pd_server_pd_server_port_0:
         type: tosca.capabilities.network.Bindable
         valid_source_types:
         - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
@@ -313,37 +323,31 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_pd_server_pd01_port:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
-      network.incoming.packets_pd_server_pd01_port:
+      disk.device.read.requests.rate_pd_server:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests.rate_pd_server:
+      disk.root.size_pd_server:
         type: org.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:
+      disk.device.read.bytes_pd_server:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes_pd_server:
+      disk.device.write.bytes_pd_server:
         type: org.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_pd_server:
+      network.incoming.packets_pd_server_pd_server_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:
@@ -368,17 +372,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_pd_server_pd01_port:
+      network.outgoing.bytes_pd_server_pd_server_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
-      forwarder_pd_server_pd01_port:
-        type: org.openecomp.capabilities.Forwarder
-        occurrences:
-        - 1
-        - UNBOUNDED
       disk.write.requests.rate_pd_server:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -397,12 +396,13 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      feature_pd_server_pd01_port:
-        type: tosca.capabilities.Node
+      disk.device.latency_pd_server:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.latency_pd_server:
+      network.incoming.packets.rate_pd_server_pd_server_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:
@@ -420,13 +420,13 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_pd_server_pd01_port:
+      disk.device.iops_pd_server:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.iops_pd_server:
+      network.outpoing.packets_pd_server_pd_server_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:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/MainServiceTemplate.yaml
index 3ae6fa0b26..3cc04b9978 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/MainServiceTemplate.yaml
@@ -132,6 +132,8 @@ topology_template:
       directives:
       - substitutable
       properties:
+        port_pd_server_port_0_network:
+        - packet_external_network
         compute_pd_server_availability_zone:
         - get_input: availabilityzone_name
         compute_pd_server_name:
@@ -140,21 +142,19 @@ topology_template:
           - 2
         vm_flavor_name:
           get_input: pd_flavor_name
-        port_pd01_port_mac_requirements:
-          mac_count_required:
-            is_required: false
-        vm_image_name:
-          get_input: pd_image_name
-        port_pd01_port_ip_requirements:
+        port_pd_server_port_0_ip_requirements:
         - ip_version: 4
           ip_count_required:
             is_required: false
           floating_ip_count_required:
             is_required: false
-        port_pd01_port_network:
-        - packet_external_network
+        vm_image_name:
+          get_input: pd_image_name
         compute_pd_server_user_data_format:
         - RAW
+        port_pd_server_port_0_mac_requirements:
+          mac_count_required:
+            is_required: false
         service_template_filter:
           substitute_service_template: Nested_pd_serverServiceTemplate.yaml
           count: 1
@@ -164,7 +164,7 @@ topology_template:
           - service_template_filter
           - index_value
       requirements:
-      - link_pd_server_pd01_port:
+      - link_pd_server_pd_server_port_0:
           capability: tosca.capabilities.network.Linkable
           node: packet_external_network
           relationship: tosca.relationships.network.LinksTo
@@ -178,6 +178,8 @@ topology_template:
       directives:
       - substitutable
       properties:
+        port_pd_server_port_0_network:
+        - packet_internal_network
         compute_pd_server_availability_zone:
         - get_input: availabilityzone_name
         compute_pd_server_name:
@@ -186,21 +188,19 @@ topology_template:
           - 0
         vm_flavor_name:
           get_input: pd_flavor_name
-        port_pd01_port_mac_requirements:
-          mac_count_required:
-            is_required: false
-        vm_image_name:
-          get_input: pd_image_name
-        port_pd01_port_ip_requirements:
+        port_pd_server_port_0_ip_requirements:
         - ip_version: 4
           ip_count_required:
             is_required: false
           floating_ip_count_required:
             is_required: false
-        port_pd01_port_network:
-        - packet_internal_network
+        vm_image_name:
+          get_input: pd_image_name
         compute_pd_server_user_data_format:
         - RAW
+        port_pd_server_port_0_mac_requirements:
+          mac_count_required:
+            is_required: false
         service_template_filter:
           substitute_service_template: Nested_pd_serverServiceTemplate.yaml
           count: 1
@@ -210,7 +210,7 @@ topology_template:
           - service_template_filter
           - index_value
       requirements:
-      - link_pd_server_pd01_port:
+      - link_pd_server_pd_server_port_0:
           capability: tosca.capabilities.network.Linkable
           node: packet_internal_network
           relationship: tosca.relationships.network.LinksTo
@@ -219,6 +219,8 @@ topology_template:
       directives:
       - substitutable
       properties:
+        port_pd_server_port_0_network:
+        - packet_internal_network
         compute_pd_server_availability_zone:
         - get_input: availabilityzone_name
         compute_pd_server_name:
@@ -227,21 +229,19 @@ topology_template:
           - 1
         vm_flavor_name:
           get_input: pd_flavor_name
-        port_pd01_port_mac_requirements:
-          mac_count_required:
-            is_required: false
-        vm_image_name:
-          get_input: pd_image_name
-        port_pd01_port_ip_requirements:
+        port_pd_server_port_0_ip_requirements:
         - ip_version: 4
           ip_count_required:
             is_required: false
           floating_ip_count_required:
             is_required: false
-        port_pd01_port_network:
-        - packet_internal_network
+        vm_image_name:
+          get_input: pd_image_name
         compute_pd_server_user_data_format:
         - RAW
+        port_pd_server_port_0_mac_requirements:
+          mac_count_required:
+            is_required: false
         service_template_filter:
           substitute_service_template: Nested_pd_serverServiceTemplate.yaml
           count: 1
@@ -251,7 +251,7 @@ topology_template:
           - service_template_filter
           - index_value
       requirements:
-      - link_pd_server_pd01_port:
+      - link_pd_server_pd_server_port_0:
           capability: tosca.capabilities.network.Linkable
           node: packet_internal_network
           relationship: tosca.relationships.network.LinksTo
@@ -267,4 +267,4 @@ topology_template:
       - network_policy_server
       - abstract_pd_server_0
       - abstract_pd_server_1
-      - abstract_pd_server_2
+      - abstract_pd_server_2
\ 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/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/Nested_pd_serverServiceTemplate.yaml
index 2d01270aaf..6b19a99ee9 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/Nested_pd_serverServiceTemplate.yaml
@@ -11,6 +11,14 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
+    port_pd_server_port_0_subnetpoolid:
+      type: string
+      required: true
+    port_pd_server_port_0_network:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     index_value:
       type: integer
       description: Index value of this substitution service template runtime instance
@@ -28,46 +36,32 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    port_pd01_port_exCP_naming:
-      type: org.openecomp.datatypes.Naming
-      required: true
-    port_pd01_port_related_networks:
-      type: list
-      required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
-    vm_flavor_name:
+    port_pd_server_port_0_network_role_tag:
       type: string
       required: true
-    port_pd01_port_mac_requirements:
-      type: org.openecomp.datatypes.network.MacRequirements
-      required: true
-    vm_image_name:
+    vm_flavor_name:
       type: string
       required: true
-    port_pd01_port_ip_requirements:
+    port_pd_server_port_0_ip_requirements:
       type: list
       required: true
       entry_schema:
         type: org.openecomp.datatypes.network.IpRequirements
-    port_pd01_port_network:
-      type: list
-      required: true
-      entry_schema:
-        type: string
-    port_pd01_port_order:
-      type: integer
-      required: true
-    port_pd01_port_subnetpoolid:
+    port_pd_server_port_0_network_role:
       type: string
       required: true
-    port_pd01_port_network_role:
+    vm_image_name:
       type: string
       required: true
-    port_pd01_port_network_role_tag:
-      type: string
+    port_pd_server_port_0_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+    port_pd_server_port_0_exCP_naming:
+      type: org.openecomp.datatypes.Naming
       required: true
-    port_pd01_port_vlan_requirements:
+    port_pd_server_port_0_vlan_requirements:
       type: list
       required: true
       entry_schema:
@@ -77,6 +71,12 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_pd_server_port_0_mac_requirements:
+      type: org.openecomp.datatypes.network.MacRequirements
+      required: true
+    port_pd_server_port_0_order:
+      type: integer
+      required: true
   node_templates:
     pd_server:
       type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server
@@ -97,31 +97,31 @@ topology_template:
           get_input:
           - compute_pd_server_user_data_format
           - index_value
-    pd_server_pd01_port:
+    pd_server_pd_server_port_0:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         exCP_naming:
-          get_input: port_pd01_port_exCP_naming
+          get_input: port_pd_server_port_0_exCP_naming
         vlan_requirements:
-          get_input: port_pd01_port_vlan_requirements
+          get_input: port_pd_server_port_0_vlan_requirements
         subinterface_indicator: false
         related_networks:
-          get_input: port_pd01_port_related_networks
+          get_input: port_pd_server_port_0_related_networks
         ip_requirements:
-          get_input: port_pd01_port_ip_requirements
+          get_input: port_pd_server_port_0_ip_requirements
         network_role_tag:
-          get_input: port_pd01_port_network_role_tag
+          get_input: port_pd_server_port_0_network_role_tag
         mac_requirements:
-          get_input: port_pd01_port_mac_requirements
+          get_input: port_pd_server_port_0_mac_requirements
         order:
-          get_input: port_pd01_port_order
+          get_input: port_pd_server_port_0_order
         network_role:
-          get_input: port_pd01_port_network_role
+          get_input: port_pd_server_port_0_network_role
         subnetpoolid:
-          get_input: port_pd01_port_subnetpoolid
+          get_input: port_pd_server_port_0_subnetpoolid
         network:
           get_input:
-          - port_pd01_port_network
+          - port_pd_server_port_0_network
           - index_value
       requirements:
       - binding:
@@ -137,6 +137,9 @@ topology_template:
       disk.read.bytes.rate_pd_server:
       - pd_server
       - disk.read.bytes.rate
+      network.outgoing.packets.rate_pd_server_pd_server_port_0:
+      - pd_server_pd_server_port_0
+      - network.outgoing.packets.rate
       memory.usage_pd_server:
       - pd_server
       - memory.usage
@@ -146,18 +149,18 @@ topology_template:
       disk.device.usage_pd_server:
       - pd_server
       - disk.device.usage
-      network.outgoing.packets.rate_pd_server_pd01_port:
-      - pd_server_pd01_port
-      - network.outgoing.packets.rate
+      forwarder_pd_server_pd_server_port_0:
+      - pd_server_pd_server_port_0
+      - forwarder
       os_pd_server:
       - pd_server
       - os
       disk.write.bytes.rate_pd_server:
       - pd_server
       - disk.write.bytes.rate
-      network.incoming.bytes_pd_server_pd01_port:
-      - pd_server_pd01_port
-      - network.incoming.bytes
+      network.outgoing.bytes.rate_pd_server_pd_server_port_0:
+      - pd_server_pd_server_port_0
+      - network.outgoing.bytes.rate
       cpu_pd_server:
       - pd_server
       - cpu
@@ -173,9 +176,6 @@ topology_template:
       disk.device.read.bytes.rate_pd_server:
       - pd_server
       - disk.device.read.bytes.rate
-      network.outgoing.bytes_pd_server_pd01_port:
-      - pd_server_pd01_port
-      - network.outgoing.bytes
       disk.iops_pd_server:
       - pd_server
       - disk.iops
@@ -185,12 +185,15 @@ topology_template:
       cpu.delta_pd_server:
       - pd_server
       - cpu.delta
-      network.incoming.packets.rate_pd_server_pd01_port:
-      - pd_server_pd01_port
-      - network.incoming.packets.rate
       vcpus_pd_server:
       - pd_server
       - vcpus
+      attachment_pd_server_pd_server_port_0:
+      - pd_server_pd_server_port_0
+      - attachment
+      network.incoming.bytes.rate_pd_server_pd_server_port_0:
+      - pd_server_pd_server_port_0
+      - network.incoming.bytes.rate
       disk.device.write.bytes.rate_pd_server:
       - pd_server
       - disk.device.write.bytes.rate
@@ -200,9 +203,6 @@ topology_template:
       endpoint_pd_server:
       - pd_server
       - endpoint
-      attachment_pd_server_pd01_port:
-      - pd_server_pd01_port
-      - attachment
       disk.capacity_pd_server:
       - pd_server
       - disk.capacity
@@ -212,6 +212,9 @@ topology_template:
       disk.allocation_pd_server:
       - pd_server
       - disk.allocation
+      network.incoming.bytes_pd_server_pd_server_port_0:
+      - pd_server_pd_server_port_0
+      - network.incoming.bytes
       binding_pd_server:
       - pd_server
       - binding
@@ -224,18 +227,15 @@ topology_template:
       disk.usage_pd_server:
       - pd_server
       - disk.usage
-      binding_pd_server_pd01_port:
-      - pd_server_pd01_port
+      feature_pd_server_pd_server_port_0:
+      - pd_server_pd_server_port_0
+      - feature
+      binding_pd_server_pd_server_port_0:
+      - pd_server_pd_server_port_0
       - binding
       disk.write.bytes_pd_server:
       - pd_server
       - disk.write.bytes
-      network.incoming.bytes.rate_pd_server_pd01_port:
-      - pd_server_pd01_port
-      - network.incoming.bytes.rate
-      network.incoming.packets_pd_server_pd01_port:
-      - pd_server_pd01_port
-      - network.incoming.packets
       disk.device.read.requests.rate_pd_server:
       - pd_server
       - disk.device.read.requests.rate
@@ -248,6 +248,9 @@ topology_template:
       disk.device.write.bytes_pd_server:
       - pd_server
       - disk.device.write.bytes
+      network.incoming.packets_pd_server_pd_server_port_0:
+      - pd_server_pd_server_port_0
+      - network.incoming.packets
       disk.device.read.requests_pd_server:
       - pd_server
       - disk.device.read.requests
@@ -257,12 +260,9 @@ topology_template:
       host_pd_server:
       - pd_server
       - host
-      network.outpoing.packets_pd_server_pd01_port:
-      - pd_server_pd01_port
-      - network.outpoing.packets
-      forwarder_pd_server_pd01_port:
-      - pd_server_pd01_port
-      - forwarder
+      network.outgoing.bytes_pd_server_pd_server_port_0:
+      - pd_server_pd_server_port_0
+      - network.outgoing.bytes
       disk.write.requests.rate_pd_server:
       - pd_server
       - disk.write.requests.rate
@@ -272,34 +272,34 @@ topology_template:
       disk.write.requests_pd_server:
       - pd_server
       - disk.write.requests
-      feature_pd_server_pd01_port:
-      - pd_server_pd01_port
-      - feature
       disk.device.latency_pd_server:
       - pd_server
       - disk.device.latency
+      network.incoming.packets.rate_pd_server_pd_server_port_0:
+      - pd_server_pd_server_port_0
+      - network.incoming.packets.rate
       disk.latency_pd_server:
       - pd_server
       - disk.latency
       disk.device.capacity_pd_server:
       - pd_server
       - disk.device.capacity
-      network.outgoing.bytes.rate_pd_server_pd01_port:
-      - pd_server_pd01_port
-      - network.outgoing.bytes.rate
       disk.device.iops_pd_server:
       - pd_server
       - disk.device.iops
+      network.outpoing.packets_pd_server_pd_server_port_0:
+      - pd_server_pd_server_port_0
+      - network.outpoing.packets
     requirements:
       local_storage_pd_server:
       - pd_server
       - local_storage
-      link_pd_server_pd01_port:
-      - pd_server_pd01_port
+      link_pd_server_pd_server_port_0:
+      - pd_server_pd_server_port_0
       - link
-      dependency_pd_server_pd01_port:
-      - pd_server_pd01_port
-      - dependency
       dependency_pd_server:
       - pd_server
+      - dependency
+      dependency_pd_server_pd_server_port_0:
+      - pd_server_pd_server_port_0
       - 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/catalogInstances/twoNovaWithDiffProperties/in/hot-mog-0108-bs1271.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/twoNovaWithDiffProperties/in/hot-mog-0108-bs1271.yml
index b244e98761..c50059b67a 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/twoNovaWithDiffProperties/in/hot-mog-0108-bs1271.yml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/twoNovaWithDiffProperties/in/hot-mog-0108-bs1271.yml
@@ -46,7 +46,7 @@ resources:
       flavor: {get_param: pd_flavor_name}
       availability_zone: {get_param: availabilityzone_name}
       networks:
-        - port: {get_resource: pd01_port_0}
+        - port: {get_resource: pd_server_0_port_0}
       user_data_format:  RAW
       key_name: key_name
       image_update_policy: image_update_policy
@@ -60,16 +60,16 @@ resources:
       flavor: {get_param: pd_flavor_name}
       availability_zone: {get_param: availabilityzone_name}
       networks:
-        - port: {get_resource: pd01_port_1}
+        - port: {get_resource: pd_server_1_port_0}
       user_data_format:  RAW
       key_name: key_name
       personality: personality
 
-  pd01_port_0:
+  pd_server_0_port_0:
     type: OS::Neutron::Port
     properties:
       network: {get_resource: packet_internal_network}
-  pd01_port_1:
+  pd_server_1_port_0:
     type: OS::Neutron::Port
     properties:
       network: {get_resource: packet_internal_network}
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/twoNovaWithDiffProperties/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/twoNovaWithDiffProperties/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 1e5c15347c..32bbbd47da 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/twoNovaWithDiffProperties/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/twoNovaWithDiffProperties/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -8,12 +8,22 @@ node_types:
   org.openecomp.resource.abstract.nodes.pd_server:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
+      port_pd_server_port_0_subnetpoolid:
+        type: string
+        required: true
+        status: SUPPORTED
       compute_pd_server_key_name:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
+      port_pd_server_port_0_network:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
@@ -34,8 +44,8 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      port_pd01_port_exCP_naming:
-        type: org.openecomp.datatypes.Naming
+      port_pd_server_port_0_network_role_tag:
+        type: string
         required: true
         status: SUPPORTED
       compute_pd_server_personality:
@@ -50,53 +60,35 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      port_pd01_port_related_networks:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vm_flavor_name:
         type: string
         required: true
         status: SUPPORTED
-      port_pd01_port_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
-        required: true
-        status: SUPPORTED
-      vm_image_name:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_pd01_port_ip_requirements:
+      port_pd_server_port_0_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
-      port_pd01_port_network:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: string
-      port_pd01_port_order:
-        type: integer
+      port_pd_server_port_0_network_role:
+        type: string
         required: true
         status: SUPPORTED
-      port_pd01_port_subnetpoolid:
+      vm_image_name:
         type: string
         required: true
         status: SUPPORTED
-      port_pd01_port_network_role:
-        type: string
+      port_pd_server_port_0_related_networks:
+        type: list
         required: true
         status: SUPPORTED
-      port_pd01_port_network_role_tag:
-        type: string
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+      port_pd_server_port_0_exCP_naming:
+        type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
-      port_pd01_port_vlan_requirements:
+      port_pd_server_port_0_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
@@ -108,6 +100,14 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_pd_server_port_0_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
+        required: true
+        status: SUPPORTED
+      port_pd_server_port_0_order:
+        type: integer
+        required: true
+        status: SUPPORTED
     requirements:
     - dependency_pd_server:
         capability: tosca.capabilities.Node
@@ -123,14 +123,14 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_pd_server_pd01_port:
+    - dependency_pd_server_pd_server_port_0:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_pd_server_pd01_port:
+    - link_pd_server_pd_server_port_0:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
@@ -148,6 +148,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      network.outgoing.packets.rate_pd_server_pd_server_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.usage_pd_server:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -166,9 +172,8 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_pd_server_pd01_port:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      forwarder_pd_server_pd_server_port_0:
+        type: org.openecomp.capabilities.Forwarder
         occurrences:
         - 1
         - UNBOUNDED
@@ -183,7 +188,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_pd_server_pd01_port:
+      network.outgoing.bytes.rate_pd_server_pd_server_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:
@@ -219,12 +224,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_pd_server_pd01_port:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
       disk.iops_pd_server:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -243,13 +242,18 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_pd_server_pd01_port:
+      vcpus_pd_server:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      vcpus_pd_server:
+      attachment_pd_server_pd_server_port_0:
+        type: tosca.capabilities.Attachment
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.incoming.bytes.rate_pd_server_pd_server_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:
@@ -272,11 +276,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_pd_server_pd01_port:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
       disk.capacity_pd_server:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -295,6 +294,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      network.incoming.bytes_pd_server_pd_server_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
       binding_pd_server:
         type: tosca.capabilities.network.Bindable
         occurrences:
@@ -317,7 +322,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      binding_pd_server_pd01_port:
+      feature_pd_server_pd_server_port_0:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      binding_pd_server_pd_server_port_0:
         type: tosca.capabilities.network.Bindable
         valid_source_types:
         - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
@@ -331,37 +341,31 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_pd_server_pd01_port:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
-      network.incoming.packets_pd_server_pd01_port:
+      disk.device.read.requests.rate_pd_server:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests.rate_pd_server:
+      disk.root.size_pd_server:
         type: org.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:
+      disk.device.read.bytes_pd_server:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes_pd_server:
+      disk.device.write.bytes_pd_server:
         type: org.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_pd_server:
+      network.incoming.packets_pd_server_pd_server_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:
@@ -386,17 +390,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_pd_server_pd01_port:
+      network.outgoing.bytes_pd_server_pd_server_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
-      forwarder_pd_server_pd01_port:
-        type: org.openecomp.capabilities.Forwarder
-        occurrences:
-        - 1
-        - UNBOUNDED
       disk.write.requests.rate_pd_server:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -415,12 +414,13 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      feature_pd_server_pd01_port:
-        type: tosca.capabilities.Node
+      disk.device.latency_pd_server:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.latency_pd_server:
+      network.incoming.packets.rate_pd_server_pd_server_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:
@@ -438,13 +438,13 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_pd_server_pd01_port:
+      disk.device.iops_pd_server:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.iops_pd_server:
+      network.outpoing.packets_pd_server_pd_server_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:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/twoNovaWithDiffProperties/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/twoNovaWithDiffProperties/out/MainServiceTemplate.yaml
index 172582fd24..929d3083df 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/twoNovaWithDiffProperties/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/twoNovaWithDiffProperties/out/MainServiceTemplate.yaml
@@ -161,6 +161,8 @@ topology_template:
       properties:
         compute_pd_server_key_name:
         - key_name
+        port_pd_server_port_0_network:
+        - packet_internal_network
         compute_pd_server_availability_zone:
         - get_input: availabilityzone_name
         compute_pd_server_name:
@@ -171,21 +173,19 @@ topology_template:
         - image_update_policy
         vm_flavor_name:
           get_input: pd_flavor_name
-        port_pd01_port_mac_requirements:
-          mac_count_required:
-            is_required: false
-        vm_image_name:
-          get_input: pd_image_name
-        port_pd01_port_ip_requirements:
+        port_pd_server_port_0_ip_requirements:
         - ip_version: 4
           ip_count_required:
             is_required: false
           floating_ip_count_required:
             is_required: false
-        port_pd01_port_network:
-        - packet_internal_network
+        vm_image_name:
+          get_input: pd_image_name
         compute_pd_server_user_data_format:
         - RAW
+        port_pd_server_port_0_mac_requirements:
+          mac_count_required:
+            is_required: false
         service_template_filter:
           substitute_service_template: Nested_pd_serverServiceTemplate.yaml
           count: 1
@@ -195,7 +195,7 @@ topology_template:
           - service_template_filter
           - index_value
       requirements:
-      - link_pd_server_pd01_port:
+      - link_pd_server_pd_server_port_0:
           capability: tosca.capabilities.network.Linkable
           node: packet_internal_network
           relationship: tosca.relationships.network.LinksTo
@@ -206,6 +206,8 @@ topology_template:
       properties:
         compute_pd_server_key_name:
         - key_name
+        port_pd_server_port_0_network:
+        - packet_internal_network
         compute_pd_server_availability_zone:
         - get_input: availabilityzone_name
         compute_pd_server_name:
@@ -216,21 +218,19 @@ topology_template:
         - personality
         vm_flavor_name:
           get_input: pd_flavor_name
-        port_pd01_port_mac_requirements:
-          mac_count_required:
-            is_required: false
-        vm_image_name:
-          get_input: diff_image_name
-        port_pd01_port_ip_requirements:
+        port_pd_server_port_0_ip_requirements:
         - ip_version: 4
           ip_count_required:
             is_required: false
           floating_ip_count_required:
             is_required: false
-        port_pd01_port_network:
-        - packet_internal_network
+        vm_image_name:
+          get_input: diff_image_name
         compute_pd_server_user_data_format:
         - RAW
+        port_pd_server_port_0_mac_requirements:
+          mac_count_required:
+            is_required: false
         service_template_filter:
           substitute_service_template: Nested_pd_serverServiceTemplate.yaml
           count: 1
@@ -240,7 +240,7 @@ topology_template:
           - service_template_filter
           - index_value
       requirements:
-      - link_pd_server_pd01_port:
+      - link_pd_server_pd_server_port_0:
           capability: tosca.capabilities.network.Linkable
           node: packet_internal_network
           relationship: tosca.relationships.network.LinksTo
@@ -254,4 +254,4 @@ topology_template:
       - pd01_port_2
       - packet_internal_network
       - abstract_pd_server_0
-      - abstract_pd_server_1
+      - abstract_pd_server_1
\ 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/catalogInstances/twoNovaWithDiffProperties/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/twoNovaWithDiffProperties/out/Nested_pd_serverServiceTemplate.yaml
index 81bfd43686..a77c82dd8c 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/twoNovaWithDiffProperties/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/twoNovaWithDiffProperties/out/Nested_pd_serverServiceTemplate.yaml
@@ -11,11 +11,19 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
+    port_pd_server_port_0_subnetpoolid:
+      type: string
+      required: true
     compute_pd_server_key_name:
       type: list
       required: true
       entry_schema:
         type: string
+    port_pd_server_port_0_network:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     index_value:
       type: integer
       description: Index value of this substitution service template runtime instance
@@ -33,8 +41,8 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    port_pd01_port_exCP_naming:
-      type: org.openecomp.datatypes.Naming
+    port_pd_server_port_0_network_role_tag:
+      type: string
       required: true
     compute_pd_server_personality:
       type: list
@@ -46,43 +54,29 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    port_pd01_port_related_networks:
-      type: list
-      required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     vm_flavor_name:
       type: string
       required: true
-    port_pd01_port_mac_requirements:
-      type: org.openecomp.datatypes.network.MacRequirements
-      required: true
-    vm_image_name:
-      type: string
-      required: true
-    port_pd01_port_ip_requirements:
+    port_pd_server_port_0_ip_requirements:
       type: list
       required: true
       entry_schema:
         type: org.openecomp.datatypes.network.IpRequirements
-    port_pd01_port_network:
-      type: list
-      required: true
-      entry_schema:
-        type: string
-    port_pd01_port_order:
-      type: integer
-      required: true
-    port_pd01_port_subnetpoolid:
+    port_pd_server_port_0_network_role:
       type: string
       required: true
-    port_pd01_port_network_role:
+    vm_image_name:
       type: string
       required: true
-    port_pd01_port_network_role_tag:
-      type: string
+    port_pd_server_port_0_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+    port_pd_server_port_0_exCP_naming:
+      type: org.openecomp.datatypes.Naming
       required: true
-    port_pd01_port_vlan_requirements:
+    port_pd_server_port_0_vlan_requirements:
       type: list
       required: true
       entry_schema:
@@ -92,6 +86,12 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_pd_server_port_0_mac_requirements:
+      type: org.openecomp.datatypes.network.MacRequirements
+      required: true
+    port_pd_server_port_0_order:
+      type: integer
+      required: true
   node_templates:
     pd_server:
       type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server
@@ -124,31 +124,31 @@ topology_template:
           get_input:
           - compute_pd_server_user_data_format
           - index_value
-    pd_server_pd01_port:
+    pd_server_pd_server_port_0:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         exCP_naming:
-          get_input: port_pd01_port_exCP_naming
+          get_input: port_pd_server_port_0_exCP_naming
         vlan_requirements:
-          get_input: port_pd01_port_vlan_requirements
+          get_input: port_pd_server_port_0_vlan_requirements
         subinterface_indicator: false
         related_networks:
-          get_input: port_pd01_port_related_networks
+          get_input: port_pd_server_port_0_related_networks
         ip_requirements:
-          get_input: port_pd01_port_ip_requirements
+          get_input: port_pd_server_port_0_ip_requirements
         network_role_tag:
-          get_input: port_pd01_port_network_role_tag
+          get_input: port_pd_server_port_0_network_role_tag
         mac_requirements:
-          get_input: port_pd01_port_mac_requirements
+          get_input: port_pd_server_port_0_mac_requirements
         order:
-          get_input: port_pd01_port_order
+          get_input: port_pd_server_port_0_order
         network_role:
-          get_input: port_pd01_port_network_role
+          get_input: port_pd_server_port_0_network_role
         subnetpoolid:
-          get_input: port_pd01_port_subnetpoolid
+          get_input: port_pd_server_port_0_subnetpoolid
         network:
           get_input:
-          - port_pd01_port_network
+          - port_pd_server_port_0_network
           - index_value
       requirements:
       - binding:
@@ -164,6 +164,9 @@ topology_template:
       disk.read.bytes.rate_pd_server:
       - pd_server
       - disk.read.bytes.rate
+      network.outgoing.packets.rate_pd_server_pd_server_port_0:
+      - pd_server_pd_server_port_0
+      - network.outgoing.packets.rate
       memory.usage_pd_server:
       - pd_server
       - memory.usage
@@ -173,18 +176,18 @@ topology_template:
       disk.device.usage_pd_server:
       - pd_server
       - disk.device.usage
-      network.outgoing.packets.rate_pd_server_pd01_port:
-      - pd_server_pd01_port
-      - network.outgoing.packets.rate
+      forwarder_pd_server_pd_server_port_0:
+      - pd_server_pd_server_port_0
+      - forwarder
       os_pd_server:
       - pd_server
       - os
       disk.write.bytes.rate_pd_server:
       - pd_server
       - disk.write.bytes.rate
-      network.incoming.bytes_pd_server_pd01_port:
-      - pd_server_pd01_port
-      - network.incoming.bytes
+      network.outgoing.bytes.rate_pd_server_pd_server_port_0:
+      - pd_server_pd_server_port_0
+      - network.outgoing.bytes.rate
       cpu_pd_server:
       - pd_server
       - cpu
@@ -200,9 +203,6 @@ topology_template:
       disk.device.read.bytes.rate_pd_server:
       - pd_server
       - disk.device.read.bytes.rate
-      network.outgoing.bytes_pd_server_pd01_port:
-      - pd_server_pd01_port
-      - network.outgoing.bytes
       disk.iops_pd_server:
       - pd_server
       - disk.iops
@@ -212,12 +212,15 @@ topology_template:
       cpu.delta_pd_server:
       - pd_server
       - cpu.delta
-      network.incoming.packets.rate_pd_server_pd01_port:
-      - pd_server_pd01_port
-      - network.incoming.packets.rate
       vcpus_pd_server:
       - pd_server
       - vcpus
+      attachment_pd_server_pd_server_port_0:
+      - pd_server_pd_server_port_0
+      - attachment
+      network.incoming.bytes.rate_pd_server_pd_server_port_0:
+      - pd_server_pd_server_port_0
+      - network.incoming.bytes.rate
       disk.device.write.bytes.rate_pd_server:
       - pd_server
       - disk.device.write.bytes.rate
@@ -227,9 +230,6 @@ topology_template:
       endpoint_pd_server:
       - pd_server
       - endpoint
-      attachment_pd_server_pd01_port:
-      - pd_server_pd01_port
-      - attachment
       disk.capacity_pd_server:
       - pd_server
       - disk.capacity
@@ -239,6 +239,9 @@ topology_template:
       disk.allocation_pd_server:
       - pd_server
       - disk.allocation
+      network.incoming.bytes_pd_server_pd_server_port_0:
+      - pd_server_pd_server_port_0
+      - network.incoming.bytes
       binding_pd_server:
       - pd_server
       - binding
@@ -251,18 +254,15 @@ topology_template:
       disk.usage_pd_server:
       - pd_server
       - disk.usage
-      binding_pd_server_pd01_port:
-      - pd_server_pd01_port
+      feature_pd_server_pd_server_port_0:
+      - pd_server_pd_server_port_0
+      - feature
+      binding_pd_server_pd_server_port_0:
+      - pd_server_pd_server_port_0
       - binding
       disk.write.bytes_pd_server:
       - pd_server
       - disk.write.bytes
-      network.incoming.bytes.rate_pd_server_pd01_port:
-      - pd_server_pd01_port
-      - network.incoming.bytes.rate
-      network.incoming.packets_pd_server_pd01_port:
-      - pd_server_pd01_port
-      - network.incoming.packets
       disk.device.read.requests.rate_pd_server:
       - pd_server
       - disk.device.read.requests.rate
@@ -275,6 +275,9 @@ topology_template:
       disk.device.write.bytes_pd_server:
       - pd_server
       - disk.device.write.bytes
+      network.incoming.packets_pd_server_pd_server_port_0:
+      - pd_server_pd_server_port_0
+      - network.incoming.packets
       disk.device.read.requests_pd_server:
       - pd_server
       - disk.device.read.requests
@@ -284,12 +287,9 @@ topology_template:
       host_pd_server:
       - pd_server
       - host
-      network.outpoing.packets_pd_server_pd01_port:
-      - pd_server_pd01_port
-      - network.outpoing.packets
-      forwarder_pd_server_pd01_port:
-      - pd_server_pd01_port
-      - forwarder
+      network.outgoing.bytes_pd_server_pd_server_port_0:
+      - pd_server_pd_server_port_0
+      - network.outgoing.bytes
       disk.write.requests.rate_pd_server:
       - pd_server
       - disk.write.requests.rate
@@ -299,34 +299,34 @@ topology_template:
       disk.write.requests_pd_server:
       - pd_server
       - disk.write.requests
-      feature_pd_server_pd01_port:
-      - pd_server_pd01_port
-      - feature
       disk.device.latency_pd_server:
       - pd_server
       - disk.device.latency
+      network.incoming.packets.rate_pd_server_pd_server_port_0:
+      - pd_server_pd_server_port_0
+      - network.incoming.packets.rate
       disk.latency_pd_server:
       - pd_server
       - disk.latency
       disk.device.capacity_pd_server:
       - pd_server
       - disk.device.capacity
-      network.outgoing.bytes.rate_pd_server_pd01_port:
-      - pd_server_pd01_port
-      - network.outgoing.bytes.rate
       disk.device.iops_pd_server:
       - pd_server
       - disk.device.iops
+      network.outpoing.packets_pd_server_pd_server_port_0:
+      - pd_server_pd_server_port_0
+      - network.outpoing.packets
     requirements:
       local_storage_pd_server:
       - pd_server
       - local_storage
-      link_pd_server_pd01_port:
-      - pd_server_pd01_port
+      link_pd_server_pd_server_port_0:
+      - pd_server_pd_server_port_0
       - link
-      dependency_pd_server_pd01_port:
-      - pd_server_pd01_port
-      - dependency
       dependency_pd_server:
       - pd_server
+      - dependency
+      dependency_pd_server_pd_server_port_0:
+      - pd_server_pd_server_port_0
       - dependency
\ No newline at end of file