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>

5 files changed, 822 insertions, 822 deletions

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/in/nested1.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/in/nested1.yml
index 065355486c..5780c76f91 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/in/nested1.yml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/in/nested1.yml
@@ -100,14 +100,14 @@ resources:
       networks:
       - port: { get_resource: ps_server_1b_port }
       
-  cmaui_port_1:
+  cmaui_1c1_1_mgmt_port_0:
     type: OS::Neutron::Port
     properties:
       network: {get_resource: packet_internal_network}
       fixed_ips: [{"ip_address": {get_param: [cmaui_oam_ips, 0]}}]
       replacement_policy: AUTO
 
-  cmaui_port_2:
+  cmaui_1c1_2_mgmt_port_0:
     type: OS::Neutron::Port
     properties:
       network: {get_resource: packet_internal_network}
@@ -122,7 +122,7 @@ resources:
       availability_zone: { get_param: availability_zone_0 }
       flavor: { get_param: cmaui_1c1_flavor }
       networks:
-      - port: { get_resource: cmaui_port_1 }
+      - port: { get_resource: cmaui_1c1_1_mgmt_port_0 }
 
   server_1c1_cmaui_2:
     type: OS::Nova::Server
@@ -132,16 +132,16 @@ resources:
       availability_zone: { get_param: availability_zone_0 }
       flavor: { get_param: cmaui_1c1_flavor }
       networks:
-      - port: { get_resource: cmaui_port_2 }
+      - port: { get_resource: cmaui_1c1_2_mgmt_port_0 }
 
-  oam_port_1:
+  oam_server_1c2_1_mgmt_port_0:
     type: OS::Neutron::Port
     properties:
       network: {get_resource: packet_internal_network}
       fixed_ips: [{"ip_address": {get_param: [cmaui_oam_ips, 1]}}]
       replacement_policy: AUTO
 
-  oam_port_2:
+  oam_server_1c2_2_mgmt_port_0:
     type: OS::Neutron::Port
     properties:
       network: {get_resource: packet_external_network}
@@ -156,7 +156,7 @@ resources:
       availability_zone: { get_param: availability_zone_0 }
       flavor: { get_param: oam_server_1c2_flavor }
       networks:
-      - port: { get_resource: oam_port_1 }
+      - port: { get_resource: oam_server_1c2_1_mgmt_port_0 }
 
   server_1c2_oam_2:
     type: OS::Nova::Server
@@ -166,7 +166,7 @@ resources:
       availability_zone: { get_param: availability_zone_0 }
       flavor: { get_param: oam_server_1c2_flavor }
       networks:
-      - port: { get_resource: oam_port_2 }
+      - port: { get_resource: oam_server_1c2_2_mgmt_port_0 }
 
   packet_internal_network:
     type: OS::Neutron::Net
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/GlobalSubstitutionTypesServiceTemplate.yaml
index efded1a6bc..f3636211a1 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -8,16 +8,24 @@ node_types:
   org.openecomp.resource.abstract.nodes.oam_server_1c2:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
-      port_oam_port_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
+      port_oam_server_1c2_mgmt_port_0_vlan_requirements:
+        type: list
         required: true
         status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.VlanRequirements
       compute_oam_server_1c2_name:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
+      port_oam_server_1c2_mgmt_port_0_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
@@ -26,104 +34,96 @@ node_types:
         status: SUPPORTED
         constraints:
         - greater_or_equal: 0
-      port_oam_port_network:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: string
-      port_oam_port_exCP_naming:
-        type: org.openecomp.datatypes.Naming
-        required: true
-        status: SUPPORTED
-      port_oam_port_order:
-        type: integer
+      port_oam_server_1c2_mgmt_port_0_network_role_tag:
+        type: string
         required: true
         status: SUPPORTED
-      port_oam_port_subnetpoolid:
-        type: string
+      port_oam_server_1c2_mgmt_port_0_ip_requirements:
+        type: list
         required: true
         status: SUPPORTED
-      port_oam_port_related_networks:
+        entry_schema:
+          type: org.openecomp.datatypes.network.IpRequirements
+      port_oam_server_1c2_mgmt_port_0_fixed_ips:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+          type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       vm_flavor_name:
         type: string
         required: true
         status: SUPPORTED
-      compute_oam_server_1c2_availability_zone:
-        type: list
+      port_oam_server_1c2_mgmt_port_0_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
-      port_oam_port_fixed_ips:
+      compute_oam_server_1c2_availability_zone:
         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_oam_port_vlan_requirements:
+      port_oam_server_1c2_mgmt_port_0_network:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
-      port_oam_port_ip_requirements:
-        type: list
+          type: string
+      port_oam_server_1c2_mgmt_port_0_order:
+        type: integer
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
-      port_oam_port_replacement_policy:
-        type: list
+      port_oam_server_1c2_mgmt_port_0_exCP_naming:
+        type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
-      port_oam_port_network_role_tag:
+      port_oam_server_1c2_mgmt_port_0_subnetpoolid:
         type: string
         required: true
         status: SUPPORTED
-      port_oam_port_network_role:
+      port_oam_server_1c2_mgmt_port_0_replacement_policy:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_oam_server_1c2_mgmt_port_0_network_role:
         type: string
         required: true
         status: SUPPORTED
     requirements:
-    - dependency_oam_server_1c2:
+    - dependency_oam_server_1c2_oam_server_1c2_mgmt_port_0:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - local_storage_oam_server_1c2:
-        capability: tosca.capabilities.Attachment
-        node: tosca.nodes.BlockStorage
-        relationship: tosca.relationships.AttachesTo
+    - link_oam_server_1c2_oam_server_1c2_mgmt_port_0:
+        capability: tosca.capabilities.network.Linkable
+        relationship: tosca.relationships.network.LinksTo
         occurrences:
-        - 0
-        - UNBOUNDED
-    - dependency_oam_server_1c2_oam_port:
+        - 1
+        - 1
+    - dependency_oam_server_1c2:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_oam_server_1c2_oam_port:
-        capability: tosca.capabilities.network.Linkable
-        relationship: tosca.relationships.network.LinksTo
+    - local_storage_oam_server_1c2:
+        capability: tosca.capabilities.Attachment
+        node: tosca.nodes.BlockStorage
+        relationship: tosca.relationships.AttachesTo
         occurrences:
-        - 1
-        - 1
+        - 0
+        - UNBOUNDED
     capabilities:
       disk.device.usage_oam_server_1c2:
         type: org.openecomp.capabilities.metric.Ceilometer
@@ -160,18 +160,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_oam_server_1c2_oam_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.outpoing.packets_oam_server_1c2_oam_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_util_oam_server_1c2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -184,18 +172,15 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.allocation_oam_server_1c2:
-        type: org.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_oam_server_1c2_oam_port:
-        type: tosca.capabilities.Attachment
+      binding_oam_server_1c2_oam_server_1c2_mgmt_port_0:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface
         occurrences:
-        - 1
+        - 0
         - UNBOUNDED
-      network.incoming.bytes.rate_oam_server_1c2_oam_port:
+      disk.device.allocation_oam_server_1c2:
         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,7 +204,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_oam_server_1c2_oam_port:
+      network.outgoing.bytes.rate_oam_server_1c2_oam_server_1c2_mgmt_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:
@@ -237,13 +222,13 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_oam_server_1c2_oam_port:
+      network.incoming.packets_oam_server_1c2_oam_server_1c2_mgmt_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_oam_server_1c2_oam_port:
+      network.incoming.packets.rate_oam_server_1c2_oam_server_1c2_mgmt_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:
@@ -261,13 +246,13 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_oam_server_1c2_oam_port:
+      cpu_oam_server_1c2:
         type: org.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_oam_server_1c2:
+      network.outpoing.packets_oam_server_1c2_oam_server_1c2_mgmt_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:
@@ -309,17 +294,17 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      forwarder_oam_server_1c2_oam_port:
-        type: org.openecomp.capabilities.Forwarder
-        occurrences:
-        - 1
-        - UNBOUNDED
       disk.ephemeral.size_oam_server_1c2:
         type: org.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_oam_server_1c2_oam_server_1c2_mgmt_port_0:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
       memory.resident_oam_server_1c2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -344,31 +329,33 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      attachment_oam_server_1c2_oam_server_1c2_mgmt_port_0:
+        type: tosca.capabilities.Attachment
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.usage_oam_server_1c2:
         type: org.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_oam_server_1c2_oam_port:
+      network.outgoing.bytes_oam_server_1c2_oam_server_1c2_mgmt_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_oam_server_1c2_oam_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
       os_oam_server_1c2:
         type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_oam_server_1c2_oam_server_1c2_mgmt_port_0:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.read.requests_oam_server_1c2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -381,8 +368,9 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      feature_oam_server_1c2_oam_port:
-        type: tosca.capabilities.Node
+      network.incoming.bytes_oam_server_1c2_oam_server_1c2_mgmt_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
@@ -420,6 +408,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      network.outgoing.packets.rate_oam_server_1c2_oam_server_1c2_mgmt_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.capacity_oam_server_1c2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -438,6 +432,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      network.incoming.bytes.rate_oam_server_1c2_oam_server_1c2_mgmt_port_0:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
   org.openecomp.resource.abstract.nodes.pd_server_1b:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
@@ -989,7 +989,14 @@ node_types:
         entry_schema:
           type: string
     requirements:
-    - dependency_cmaui_port_2:
+    - dependency_oam_server_1c2_1_mgmt_port_0:
+        capability: tosca.capabilities.Node
+        node: tosca.nodes.Root
+        relationship: tosca.relationships.DependsOn
+        occurrences:
+        - 0
+        - UNBOUNDED
+    - dependency_oam_server_1c2_2_mgmt_port_0:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
@@ -1038,7 +1045,14 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_cmaui_port_1:
+    - dependency_cmaui_1c1_2_mgmt_port_0:
+        capability: tosca.capabilities.Node
+        node: tosca.nodes.Root
+        relationship: tosca.relationships.DependsOn
+        occurrences:
+        - 0
+        - UNBOUNDED
+    - dependency_cmaui_1c1_1_mgmt_port_0:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
@@ -1058,13 +1072,6 @@ node_types:
         occurrences:
         - 1
         - 1
-    - dependency_oam_port_1:
-        capability: tosca.capabilities.Node
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.DependsOn
-        occurrences:
-        - 0
-        - UNBOUNDED
     - dependency_packet_external_network:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
@@ -1134,13 +1141,6 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_oam_port_2:
-        capability: tosca.capabilities.Node
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.DependsOn
-        occurrences:
-        - 0
-        - UNBOUNDED
     capabilities:
       disk.capacity_server_1b_pd:
         type: org.openecomp.capabilities.metric.Ceilometer
@@ -1148,6 +1148,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      network.incoming.packets_oam_server_1c2_1_mgmt_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.rate_server_1c2_oam_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -1184,85 +1190,89 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.iops_server_1c2_oam_2:
+      network.incoming.packets_oam_server_1c2_2_mgmt_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.usage_server_1c2_oam_2:
+      feature_cmaui_1c1_1_mgmt_port_0:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.iops_server_1c2_oam_2:
         type: org.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_server_1c1_cmaui_2:
+      disk.usage_server_1c2_oam_2:
         type: org.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_server_1c1_cmaui_1:
-        type: tosca.capabilities.Node
+      network.outgoing.bytes_cmaui_1c1_1_mgmt_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.usage_server_1c2_oam_1:
+      disk.read.requests_server_1c1_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_pd_server_1b_port:
+      network.outgoing.bytes_cmaui_1c1_2_mgmt_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_server_1c1_cmaui_2:
+      feature_server_1c1_cmaui_1:
         type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.requests_server_1c1_cmaui_1:
+      disk.usage_server_1c2_oam_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.iops_server_1b_ps:
+      network.incoming.bytes_pd_server_1b_port:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_cmaui_port_2:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_server_1c1_cmaui_2:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.iops_server_1c2_oam_1:
+      disk.read.requests_server_1c1_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_cmaui_port_1:
+      disk.device.iops_server_1b_ps:
         type: org.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_oam_port_2:
+      disk.iops_server_1c2_oam_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_oam_port_1:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_cmaui_1c1_2_mgmt_port_0:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
@@ -1340,6 +1350,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      network.outgoing.packets.rate_oam_server_1c2_2_mgmt_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_server_1c1_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -1364,6 +1380,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      network.incoming.packets.rate_oam_server_1c2_1_mgmt_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_server_1b_ps:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -1410,53 +1432,31 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_oam_port_1:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
-      network.outpoing.packets_oam_port_2:
+      memory.usage_server_1b_ps:
         type: org.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_cmaui_port_1:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface
-        occurrences:
-        - 0
-        - UNBOUNDED
-      binding_cmaui_port_2:
-        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_server_1b_ps:
+      cpu_util_server_1b_pd:
         type: org.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_server_1b_pd:
+      cpu_util_server_1c2_oam_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_util_server_1c2_oam_1:
+      cpu_util_server_1c2_oam_2:
         type: org.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_server_1c2_oam_2:
+      network.incoming.packets.rate_oam_server_1c2_2_mgmt_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:
@@ -1504,13 +1504,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_cmaui_port_2:
-        type: org.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_cmaui_port_1:
+      network.outgoing.packets.rate_oam_server_1c2_1_mgmt_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:
@@ -1567,13 +1561,13 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes_server_1b_ps:
+      network.incoming.bytes_cmaui_1c1_1_mgmt_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_cmaui_port_1:
+      disk.device.write.bytes_server_1b_ps:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -1585,64 +1579,48 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_cmaui_port_2:
-        type: org.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_cmaui_port_1:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
       network.incoming.bytes.rate_pd_server_1b_port:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_oam_port_2:
+      instance_server_1b_ps:
         type: org.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_cmaui_port_2:
+      feature_server_1c2_oam_1:
         type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      instance_server_1b_ps:
+      disk.device.capacity_server_1c1_cmaui_2:
         type: org.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_server_1c2_oam_1:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      network.outgoing.bytes_oam_port_1:
+      instance_server_1c1_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.capacity_server_1c1_cmaui_2:
+      cpu.delta_server_1b_ps:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      instance_server_1c1_cmaui_2:
+      network.outgoing.bytes.rate_oam_server_1c2_2_mgmt_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_server_1b_ps:
+      network.outgoing.packets.rate_cmaui_1c1_1_mgmt_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:
@@ -1654,6 +1632,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      attachment_cmaui_1c1_1_mgmt_port_0:
+        type: tosca.capabilities.Attachment
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.read.requests.rate_server_1c2_oam_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -1666,11 +1649,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_oam_port_2:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
       disk.device.write.bytes.rate_server_1b_pd:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -1695,7 +1673,21 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_oam_port_1:
+      binding_oam_server_1c2_2_mgmt_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.outpoing.packets_oam_server_1c2_1_mgmt_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_oam_server_1c2_1_mgmt_port_0:
         type: tosca.capabilities.Attachment
         occurrences:
         - 1
@@ -1769,6 +1761,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      network.incoming.packets_cmaui_1c1_2_mgmt_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_ps_server_1b_port:
         type: tosca.capabilities.network.Bindable
         valid_source_types:
@@ -1783,16 +1781,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      forwarder_cmaui_port_2:
-        type: org.openecomp.capabilities.Forwarder
-        occurrences:
-        - 1
-        - UNBOUNDED
-      forwarder_cmaui_port_1:
-        type: org.openecomp.capabilities.Forwarder
-        occurrences:
-        - 1
-        - UNBOUNDED
       disk.device.write.requests_server_1b_ps:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -1834,6 +1822,20 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      binding_cmaui_1c1_2_mgmt_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.outgoing.bytes_oam_server_1c2_1_mgmt_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.read.requests_server_1b_pd:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -1846,6 +1848,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      network.incoming.bytes_oam_server_1c2_1_mgmt_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.allocation_server_1c2_oam_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -1896,14 +1904,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      binding_oam_port_2:
-        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.write.bytes.rate_server_1c1_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -1922,13 +1922,15 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      binding_oam_port_1:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface
+      feature_oam_server_1c2_2_mgmt_port_0:
+        type: tosca.capabilities.Node
         occurrences:
-        - 0
+        - 1
+        - UNBOUNDED
+      forwarder_oam_server_1c2_1_mgmt_port_0:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
         - UNBOUNDED
       disk.read.bytes.rate_server_1c1_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
@@ -1962,24 +1964,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_cmaui_port_1:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
       disk.allocation_server_1b_ps:
         type: org.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_cmaui_port_2:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
       disk.latency_server_1c2_oam_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -2057,25 +2047,25 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.root.size_server_1c2_oam_2:
+      network.incoming.bytes.rate_cmaui_1c1_2_mgmt_port_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      memory.resident_server_1c1_cmaui_1:
+      disk.root.size_server_1c2_oam_2:
         type: org.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_ps_server_1b_port:
+      memory.resident_server_1c1_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_oam_port_1:
+      network.incoming.bytes.rate_ps_server_1b_port:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -2086,6 +2076,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      network.incoming.bytes.rate_oam_server_1c2_1_mgmt_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
       os_server_1c1_cmaui_1:
         type: tosca.capabilities.OperatingSystem
         occurrences:
@@ -2097,13 +2093,19 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      instance_server_1c2_oam_2:
+      network.incoming.bytes.rate_cmaui_1c1_1_mgmt_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_oam_port_2:
+      network.outgoing.bytes.rate_cmaui_1c1_1_mgmt_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
+      instance_server_1c2_oam_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -2115,6 +2117,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      network.outgoing.bytes.rate_cmaui_1c1_2_mgmt_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_server_1c1_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -2178,16 +2186,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      forwarder_oam_port_1:
-        type: org.openecomp.capabilities.Forwarder
-        occurrences:
-        - 1
-        - UNBOUNDED
-      forwarder_oam_port_2:
-        type: org.openecomp.capabilities.Forwarder
-        occurrences:
-        - 1
-        - UNBOUNDED
       binding_server_1c2_oam_2:
         type: tosca.capabilities.network.Bindable
         occurrences:
@@ -2208,6 +2206,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_1c1_1_mgmt_port_0:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.outgoing.packets.rate_pd_server_1b_port:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -2238,6 +2241,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_1c1_2_mgmt_port_0:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.write.requests_server_1c2_oam_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -2261,6 +2269,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      network.incoming.bytes.rate_oam_server_1c2_2_mgmt_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.latency_server_1b_ps:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -2303,25 +2317,25 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_cmaui_port_2:
+      disk.device.write.bytes.rate_server_1c1_cmaui_2:
         type: org.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_server_1c1_cmaui_2:
+      disk.ephemeral.size_server_1b_pd:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.ephemeral.size_server_1b_pd:
+      disk.device.write.requests_server_1c2_oam_2:
         type: org.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_server_1c2_oam_2:
+      network.incoming.packets.rate_cmaui_1c1_1_mgmt_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:
@@ -2339,7 +2353,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_cmaui_port_1:
+      network.incoming.packets.rate_cmaui_1c1_2_mgmt_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:
@@ -2455,24 +2469,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_oam_port_1:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
       disk.write.bytes_server_1b_ps:
         type: org.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_oam_port_2:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
       end_point_packet_external_network:
         type: tosca.capabilities.Endpoint
         occurrences:
@@ -2507,6 +2509,18 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      network.outpoing.packets_cmaui_1c1_2_mgmt_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_cmaui_1c1_1_mgmt_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_server_1b_pd:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -2561,12 +2575,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_cmaui_port_2:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
       disk.root.size_server_1b_pd:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -2579,12 +2587,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_cmaui_port_1:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
       cpu_server_1c1_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -2645,12 +2647,23 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      attachment_cmaui_1c1_2_mgmt_port_0:
+        type: tosca.capabilities.Attachment
+        occurrences:
+        - 1
+        - UNBOUNDED
       cpu.delta_server_1c2_oam_2:
         type: org.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_oam_server_1c2_1_mgmt_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.iops_server_1b_pd:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -2663,6 +2676,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      network.incoming.bytes_cmaui_1c1_2_mgmt_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.usage_server_1c1_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -2686,7 +2705,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_oam_port_2:
+      network.outgoing.packets.rate_cmaui_1c1_2_mgmt_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:
@@ -2697,12 +2716,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_oam_port_1:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
       forwarder_pd_server_1b_port:
         type: org.openecomp.capabilities.Forwarder
         occurrences:
@@ -2714,23 +2727,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_cmaui_port_2:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
-      network.outgoing.bytes.rate_oam_port_1:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
-      network.outgoing.bytes.rate_oam_port_2:
-        type: org.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_server_1b_ps:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -2743,23 +2739,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_1:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_2:
-        type: org.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_cmaui_port_1:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
       disk.capacity_server_1c1_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -2784,6 +2763,14 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      binding_oam_server_1c2_1_mgmt_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.rate_server_1c1_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -2808,6 +2795,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      attachment_oam_server_1c2_2_mgmt_port_0:
+        type: tosca.capabilities.Attachment
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.incoming.packets_ps_server_1b_port:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -2820,6 +2812,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      network.incoming.packets_cmaui_1c1_1_mgmt_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_pd_server_1b_port:
         type: tosca.capabilities.Node
         occurrences:
@@ -2895,13 +2893,23 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      feature_oam_port_2:
-        type: tosca.capabilities.Node
+      network.outgoing.bytes_oam_server_1c2_2_mgmt_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_oam_port_1:
-        type: tosca.capabilities.Node
+      binding_cmaui_1c1_1_mgmt_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_oam_server_1c2_2_mgmt_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
@@ -2928,6 +2936,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      feature_oam_server_1c2_1_mgmt_port_0:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
       link_packet_internal_network:
         type: tosca.capabilities.network.Linkable
         occurrences:
@@ -2961,26 +2974,19 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      endpoint_server_1b_ps:
-        type: tosca.capabilities.Endpoint.Admin
-        occurrences:
-        - 1
-        - UNBOUNDED
-      network.incoming.packets_oam_port_1:
+      network.outpoing.packets_oam_server_1c2_2_mgmt_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_oam_port_2:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      endpoint_server_1b_ps:
+        type: tosca.capabilities.Endpoint.Admin
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_cmaui_port_1:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      forwarder_oam_server_1c2_2_mgmt_port_0:
+        type: org.openecomp.capabilities.Forwarder
         occurrences:
         - 1
         - UNBOUNDED
@@ -2990,12 +2996,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_cmaui_port_2:
-        type: org.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_server_1b_ps:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -3496,71 +3496,73 @@ node_types:
   org.openecomp.resource.abstract.nodes.cmaui_1c1:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
-      port_cmaui_port_vlan_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
-      port_cmaui_port_fixed_ips:
+      port_cmaui_1c1_mgmt_port_0_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.heat.neutron.port.FixedIps
-      port_cmaui_port_exCP_naming:
-        type: org.openecomp.datatypes.Naming
-        required: true
+          type: org.openecomp.datatypes.network.IpRequirements
+      index_value:
+        type: integer
+        description: Index value of this substitution service template runtime instance
+        required: false
+        default: 0
         status: SUPPORTED
-      port_cmaui_port_network:
+        constraints:
+        - greater_or_equal: 0
+      port_cmaui_1c1_mgmt_port_0_network:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_cmaui_port_related_networks:
+      port_cmaui_1c1_mgmt_port_0_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
-      index_value:
-        type: integer
-        description: Index value of this substitution service template runtime instance
-        required: false
-        default: 0
-        status: SUPPORTED
-        constraints:
-        - greater_or_equal: 0
+          type: org.openecomp.datatypes.network.VlanRequirements
       compute_cmaui_1c1_availability_zone:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_cmaui_port_network_role_tag:
-        type: string
+      port_cmaui_1c1_mgmt_port_0_exCP_naming:
+        type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
-      port_cmaui_port_order:
-        type: integer
+      port_cmaui_1c1_mgmt_port_0_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
         required: true
         status: SUPPORTED
       vm_flavor_name:
         type: string
         required: true
         status: SUPPORTED
-      port_cmaui_port_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
+      port_cmaui_1c1_mgmt_port_0_fixed_ips:
+        type: list
         required: true
         status: SUPPORTED
-      port_cmaui_port_replacement_policy:
+        entry_schema:
+          type: org.openecomp.datatypes.heat.neutron.port.FixedIps
+      port_cmaui_1c1_mgmt_port_0_network_role:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_cmaui_1c1_mgmt_port_0_replacement_policy:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_cmaui_port_network_role:
+      port_cmaui_1c1_mgmt_port_0_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+      port_cmaui_1c1_mgmt_port_0_network_role_tag:
         type: string
         required: true
         status: SUPPORTED
@@ -3568,31 +3570,29 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
-      port_cmaui_port_ip_requirements:
-        type: list
+      port_cmaui_1c1_mgmt_port_0_order:
+        type: integer
+        required: true
+        status: SUPPORTED
+      port_cmaui_1c1_mgmt_port_0_subnetpoolid:
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
       compute_cmaui_1c1_name:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_cmaui_port_subnetpoolid:
-        type: string
-        required: true
-        status: SUPPORTED
     requirements:
-    - dependency_cmaui_1c1_cmaui_port:
+    - dependency_cmaui_1c1_cmaui_1c1_mgmt_port_0:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_cmaui_1c1_cmaui_port:
+    - link_cmaui_1c1_cmaui_1c1_mgmt_port_0:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
@@ -3613,14 +3613,6 @@ node_types:
         - 0
         - UNBOUNDED
     capabilities:
-      binding_cmaui_1c1_cmaui_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.iops_cmaui_1c1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -3644,49 +3636,50 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_cmaui_1c1_cmaui_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_cmaui_1c1_cmaui_1c1_mgmt_port_0:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface
         occurrences:
-        - 1
+        - 0
         - UNBOUNDED
-      network.incoming.packets_cmaui_1c1_cmaui_port:
+      network.outgoing.bytes.rate_cmaui_1c1_cmaui_1c1_mgmt_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_cmaui_1c1_cmaui_port:
+      network.outgoing.bytes_cmaui_1c1_cmaui_1c1_mgmt_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_cmaui_1c1_cmaui_port:
+      memory_cmaui_1c1:
         type: org.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_cmaui_1c1_cmaui_port:
+      disk.latency_cmaui_1c1:
         type: org.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_cmaui_1c1:
+      disk.read.bytes.rate_cmaui_1c1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.latency_cmaui_1c1:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      attachment_cmaui_1c1_cmaui_1c1_mgmt_port_0:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes.rate_cmaui_1c1:
+      network.incoming.packets_cmaui_1c1_cmaui_1c1_mgmt_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:
@@ -3722,25 +3715,25 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_1c1_cmaui_port:
+      disk.device.read.bytes.rate_cmaui_1c1:
         type: org.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_cmaui_1c1:
+      disk.ephemeral.size_cmaui_1c1:
         type: org.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_cmaui_1c1:
+      instance_cmaui_1c1:
         type: org.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_cmaui_1c1:
+      network.incoming.packets.rate_cmaui_1c1_cmaui_1c1_mgmt_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:
@@ -3752,6 +3745,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      feature_cmaui_1c1_cmaui_1c1_mgmt_port_0:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.write.bytes.rate_cmaui_1c1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -3795,12 +3793,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_cmaui_1c1_cmaui_port:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
       disk.write.bytes.rate_cmaui_1c1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -3841,20 +3833,25 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      network.incoming.bytes_cmaui_1c1_cmaui_1c1_mgmt_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_cmaui_1c1:
         type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_cmaui_1c1_cmaui_port:
+      disk.allocation_cmaui_1c1:
         type: org.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.allocation_cmaui_1c1:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      forwarder_cmaui_1c1_cmaui_1c1_mgmt_port_0:
+        type: org.openecomp.capabilities.Forwarder
         occurrences:
         - 1
         - UNBOUNDED
@@ -3870,8 +3867,9 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      forwarder_cmaui_1c1_cmaui_port:
-        type: org.openecomp.capabilities.Forwarder
+      network.outgoing.packets.rate_cmaui_1c1_cmaui_1c1_mgmt_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
@@ -3887,12 +3885,13 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_cmaui_1c1_cmaui_port:
-        type: tosca.capabilities.Attachment
+      disk.usage_cmaui_1c1:
+        type: org.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_cmaui_1c1:
+      network.incoming.bytes.rate_cmaui_1c1_cmaui_1c1_mgmt_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:
@@ -3915,8 +3914,9 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      feature_cmaui_1c1_cmaui_port:
-        type: tosca.capabilities.Node
+      network.outpoing.packets_cmaui_1c1_cmaui_1c1_mgmt_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
@@ -3925,4 +3925,4 @@ node_types:
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
-        - UNBOUNDED
\ No newline at end of file
+        - UNBOUNDED
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_cmaui_1c1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_cmaui_1c1ServiceTemplate.yaml
index c7ec23eb2e..b75b3833cd 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_cmaui_1c1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_cmaui_1c1ServiceTemplate.yaml
@@ -11,29 +11,11 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
-    port_cmaui_port_vlan_requirements:
+    port_cmaui_1c1_mgmt_port_0_ip_requirements:
       type: list
       required: true
       entry_schema:
-        type: org.openecomp.datatypes.network.VlanRequirements
-    port_cmaui_port_fixed_ips:
-      type: list
-      required: true
-      entry_schema:
-        type: org.openecomp.datatypes.heat.neutron.port.FixedIps
-    port_cmaui_port_exCP_naming:
-      type: org.openecomp.datatypes.Naming
-      required: true
-    port_cmaui_port_network:
-      type: list
-      required: true
-      entry_schema:
-        type: string
-    port_cmaui_port_related_networks:
-      type: list
-      required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+        type: org.openecomp.datatypes.network.IpRequirements
     index_value:
       type: integer
       description: Index value of this substitution service template runtime instance
@@ -41,81 +23,99 @@ topology_template:
       default: 0
       constraints:
       - greater_or_equal: 0
+    port_cmaui_1c1_mgmt_port_0_network:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_cmaui_1c1_mgmt_port_0_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.VlanRequirements
     compute_cmaui_1c1_availability_zone:
       type: list
       required: true
       entry_schema:
         type: string
-    port_cmaui_port_network_role_tag:
-      type: string
+    port_cmaui_1c1_mgmt_port_0_exCP_naming:
+      type: org.openecomp.datatypes.Naming
       required: true
-    port_cmaui_port_order:
-      type: integer
+    port_cmaui_1c1_mgmt_port_0_mac_requirements:
+      type: org.openecomp.datatypes.network.MacRequirements
       required: true
     vm_flavor_name:
       type: string
       required: true
-    port_cmaui_port_mac_requirements:
-      type: org.openecomp.datatypes.network.MacRequirements
+    port_cmaui_1c1_mgmt_port_0_fixed_ips:
+      type: list
       required: true
-    port_cmaui_port_replacement_policy:
+      entry_schema:
+        type: org.openecomp.datatypes.heat.neutron.port.FixedIps
+    port_cmaui_1c1_mgmt_port_0_network_role:
+      type: string
+      required: true
+    port_cmaui_1c1_mgmt_port_0_replacement_policy:
       type: list
       required: true
       entry_schema:
         type: string
-    port_cmaui_port_network_role:
+    port_cmaui_1c1_mgmt_port_0_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+    port_cmaui_1c1_mgmt_port_0_network_role_tag:
       type: string
       required: true
     vm_image_name:
       type: string
       required: true
-    port_cmaui_port_ip_requirements:
-      type: list
+    port_cmaui_1c1_mgmt_port_0_order:
+      type: integer
+      required: true
+    port_cmaui_1c1_mgmt_port_0_subnetpoolid:
+      type: string
       required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.IpRequirements
     compute_cmaui_1c1_name:
       type: list
       required: true
       entry_schema:
         type: string
-    port_cmaui_port_subnetpoolid:
-      type: string
-      required: true
   node_templates:
-    cmaui_1c1_cmaui_port:
+    cmaui_1c1_cmaui_1c1_mgmt_port_0:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         replacement_policy:
           get_input:
-          - port_cmaui_port_replacement_policy
+          - port_cmaui_1c1_mgmt_port_0_replacement_policy
           - index_value
         mac_requirements:
-          get_input: port_cmaui_port_mac_requirements
+          get_input: port_cmaui_1c1_mgmt_port_0_mac_requirements
         order:
-          get_input: port_cmaui_port_order
+          get_input: port_cmaui_1c1_mgmt_port_0_order
         exCP_naming:
-          get_input: port_cmaui_port_exCP_naming
+          get_input: port_cmaui_1c1_mgmt_port_0_exCP_naming
         vlan_requirements:
-          get_input: port_cmaui_port_vlan_requirements
+          get_input: port_cmaui_1c1_mgmt_port_0_vlan_requirements
         subinterface_indicator: false
         ip_requirements:
-          get_input: port_cmaui_port_ip_requirements
+          get_input: port_cmaui_1c1_mgmt_port_0_ip_requirements
         related_networks:
-          get_input: port_cmaui_port_related_networks
+          get_input: port_cmaui_1c1_mgmt_port_0_related_networks
         network_role_tag:
-          get_input: port_cmaui_port_network_role_tag
+          get_input: port_cmaui_1c1_mgmt_port_0_network_role_tag
         network_role:
-          get_input: port_cmaui_port_network_role
+          get_input: port_cmaui_1c1_mgmt_port_0_network_role
         fixed_ips:
           get_input:
-          - port_cmaui_port_fixed_ips
+          - port_cmaui_1c1_mgmt_port_0_fixed_ips
           - index_value
         subnetpoolid:
-          get_input: port_cmaui_port_subnetpoolid
+          get_input: port_cmaui_1c1_mgmt_port_0_subnetpoolid
         network:
           get_input:
-          - port_cmaui_port_network
+          - port_cmaui_1c1_mgmt_port_0_network
           - index_value
       requirements:
       - binding:
@@ -140,9 +140,6 @@ topology_template:
   substitution_mappings:
     node_type: org.openecomp.resource.abstract.nodes.cmaui_1c1
     capabilities:
-      binding_cmaui_1c1_cmaui_port:
-      - cmaui_1c1_cmaui_port
-      - binding
       disk.iops_cmaui_1c1:
       - cmaui_1c1
       - disk.iops
@@ -155,21 +152,15 @@ topology_template:
       endpoint_cmaui_1c1:
       - cmaui_1c1
       - endpoint
-      network.incoming.bytes.rate_cmaui_1c1_cmaui_port:
-      - cmaui_1c1_cmaui_port
-      - network.incoming.bytes.rate
-      network.incoming.packets_cmaui_1c1_cmaui_port:
-      - cmaui_1c1_cmaui_port
-      - network.incoming.packets
-      network.outgoing.bytes_cmaui_1c1_cmaui_port:
-      - cmaui_1c1_cmaui_port
-      - network.outgoing.bytes
-      network.outgoing.bytes.rate_cmaui_1c1_cmaui_port:
-      - cmaui_1c1_cmaui_port
+      binding_cmaui_1c1_cmaui_1c1_mgmt_port_0:
+      - cmaui_1c1_cmaui_1c1_mgmt_port_0
+      - binding
+      network.outgoing.bytes.rate_cmaui_1c1_cmaui_1c1_mgmt_port_0:
+      - cmaui_1c1_cmaui_1c1_mgmt_port_0
       - network.outgoing.bytes.rate
-      network.outpoing.packets_cmaui_1c1_cmaui_port:
-      - cmaui_1c1_cmaui_port
-      - network.outpoing.packets
+      network.outgoing.bytes_cmaui_1c1_cmaui_1c1_mgmt_port_0:
+      - cmaui_1c1_cmaui_1c1_mgmt_port_0
+      - network.outgoing.bytes
       memory_cmaui_1c1:
       - cmaui_1c1
       - memory
@@ -179,6 +170,12 @@ topology_template:
       disk.read.bytes.rate_cmaui_1c1:
       - cmaui_1c1
       - disk.read.bytes.rate
+      attachment_cmaui_1c1_cmaui_1c1_mgmt_port_0:
+      - cmaui_1c1_cmaui_1c1_mgmt_port_0
+      - attachment
+      network.incoming.packets_cmaui_1c1_cmaui_1c1_mgmt_port_0:
+      - cmaui_1c1_cmaui_1c1_mgmt_port_0
+      - network.incoming.packets
       disk.write.requests.rate_cmaui_1c1:
       - cmaui_1c1
       - disk.write.requests.rate
@@ -194,9 +191,6 @@ topology_template:
       cpu_util_cmaui_1c1:
       - cmaui_1c1
       - cpu_util
-      network.outgoing.packets.rate_cmaui_1c1_cmaui_port:
-      - cmaui_1c1_cmaui_port
-      - network.outgoing.packets.rate
       disk.device.read.bytes.rate_cmaui_1c1:
       - cmaui_1c1
       - disk.device.read.bytes.rate
@@ -206,9 +200,15 @@ topology_template:
       instance_cmaui_1c1:
       - cmaui_1c1
       - instance
+      network.incoming.packets.rate_cmaui_1c1_cmaui_1c1_mgmt_port_0:
+      - cmaui_1c1_cmaui_1c1_mgmt_port_0
+      - network.incoming.packets.rate
       disk.device.read.requests_cmaui_1c1:
       - cmaui_1c1
       - disk.device.read.requests
+      feature_cmaui_1c1_cmaui_1c1_mgmt_port_0:
+      - cmaui_1c1_cmaui_1c1_mgmt_port_0
+      - feature
       disk.device.write.bytes.rate_cmaui_1c1:
       - cmaui_1c1
       - disk.device.write.bytes.rate
@@ -230,9 +230,6 @@ topology_template:
       disk.device.latency_cmaui_1c1:
       - cmaui_1c1
       - disk.device.latency
-      network.incoming.bytes_cmaui_1c1_cmaui_port:
-      - cmaui_1c1_cmaui_port
-      - network.incoming.bytes
       disk.write.bytes.rate_cmaui_1c1:
       - cmaui_1c1
       - disk.write.bytes.rate
@@ -254,36 +251,39 @@ topology_template:
       disk.device.read.requests.rate_cmaui_1c1:
       - cmaui_1c1
       - disk.device.read.requests.rate
+      network.incoming.bytes_cmaui_1c1_cmaui_1c1_mgmt_port_0:
+      - cmaui_1c1_cmaui_1c1_mgmt_port_0
+      - network.incoming.bytes
       feature_cmaui_1c1:
       - cmaui_1c1
       - feature
-      network.incoming.packets.rate_cmaui_1c1_cmaui_port:
-      - cmaui_1c1_cmaui_port
-      - network.incoming.packets.rate
       disk.allocation_cmaui_1c1:
       - cmaui_1c1
       - disk.allocation
+      forwarder_cmaui_1c1_cmaui_1c1_mgmt_port_0:
+      - cmaui_1c1_cmaui_1c1_mgmt_port_0
+      - forwarder
       disk.device.allocation_cmaui_1c1:
       - cmaui_1c1
       - disk.device.allocation
       disk.device.write.requests.rate_cmaui_1c1:
       - cmaui_1c1
       - disk.device.write.requests.rate
-      forwarder_cmaui_1c1_cmaui_port:
-      - cmaui_1c1_cmaui_port
-      - forwarder
+      network.outgoing.packets.rate_cmaui_1c1_cmaui_1c1_mgmt_port_0:
+      - cmaui_1c1_cmaui_1c1_mgmt_port_0
+      - network.outgoing.packets.rate
       disk.device.write.bytes_cmaui_1c1:
       - cmaui_1c1
       - disk.device.write.bytes
       memory.resident_cmaui_1c1:
       - cmaui_1c1
       - memory.resident
-      attachment_cmaui_1c1_cmaui_port:
-      - cmaui_1c1_cmaui_port
-      - attachment
       disk.usage_cmaui_1c1:
       - cmaui_1c1
       - disk.usage
+      network.incoming.bytes.rate_cmaui_1c1_cmaui_1c1_mgmt_port_0:
+      - cmaui_1c1_cmaui_1c1_mgmt_port_0
+      - network.incoming.bytes.rate
       disk.read.requests_cmaui_1c1:
       - cmaui_1c1
       - disk.read.requests
@@ -293,22 +293,22 @@ topology_template:
       vcpus_cmaui_1c1:
       - cmaui_1c1
       - vcpus
-      feature_cmaui_1c1_cmaui_port:
-      - cmaui_1c1_cmaui_port
-      - feature
+      network.outpoing.packets_cmaui_1c1_cmaui_1c1_mgmt_port_0:
+      - cmaui_1c1_cmaui_1c1_mgmt_port_0
+      - network.outpoing.packets
       cpu.delta_cmaui_1c1:
       - cmaui_1c1
       - cpu.delta
     requirements:
-      dependency_cmaui_1c1_cmaui_port:
-      - cmaui_1c1_cmaui_port
-      - dependency
+      link_cmaui_1c1_cmaui_1c1_mgmt_port_0:
+      - cmaui_1c1_cmaui_1c1_mgmt_port_0
+      - link
       dependency_cmaui_1c1:
       - cmaui_1c1
       - dependency
-      link_cmaui_1c1_cmaui_port:
-      - cmaui_1c1_cmaui_port
-      - link
+      dependency_cmaui_1c1_cmaui_1c1_mgmt_port_0:
+      - cmaui_1c1_cmaui_1c1_mgmt_port_0
+      - dependency
       local_storage_cmaui_1c1:
       - cmaui_1c1
-      - local_storage
\ No newline at end of file
+      - local_storage
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_oam_server_1c2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_oam_server_1c2ServiceTemplate.yaml
index 7fd2a8585f..a1b61484c5 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_oam_server_1c2ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_oam_server_1c2ServiceTemplate.yaml
@@ -11,14 +11,21 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
-    port_oam_port_mac_requirements:
-      type: org.openecomp.datatypes.network.MacRequirements
+    port_oam_server_1c2_mgmt_port_0_vlan_requirements:
+      type: list
       required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.VlanRequirements
     compute_oam_server_1c2_name:
       type: list
       required: true
       entry_schema:
         type: string
+    port_oam_server_1c2_mgmt_port_0_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     index_value:
       type: integer
       description: Index value of this substitution service template runtime instance
@@ -26,117 +33,110 @@ topology_template:
       default: 0
       constraints:
       - greater_or_equal: 0
-    port_oam_port_network:
+    port_oam_server_1c2_mgmt_port_0_network_role_tag:
+      type: string
+      required: true
+    port_oam_server_1c2_mgmt_port_0_ip_requirements:
       type: list
       required: true
       entry_schema:
-        type: string
-    port_oam_port_exCP_naming:
-      type: org.openecomp.datatypes.Naming
-      required: true
-    port_oam_port_order:
-      type: integer
-      required: true
-    port_oam_port_subnetpoolid:
-      type: string
-      required: true
-    port_oam_port_related_networks:
+        type: org.openecomp.datatypes.network.IpRequirements
+    port_oam_server_1c2_mgmt_port_0_fixed_ips:
       type: list
       required: true
       entry_schema:
-        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+        type: org.openecomp.datatypes.heat.neutron.port.FixedIps
     vm_flavor_name:
       type: string
       required: true
+    port_oam_server_1c2_mgmt_port_0_mac_requirements:
+      type: org.openecomp.datatypes.network.MacRequirements
+      required: true
     compute_oam_server_1c2_availability_zone:
       type: list
       required: true
       entry_schema:
         type: string
-    port_oam_port_fixed_ips:
-      type: list
-      required: true
-      entry_schema:
-        type: org.openecomp.datatypes.heat.neutron.port.FixedIps
     vm_image_name:
       type: string
       required: true
-    port_oam_port_vlan_requirements:
+    port_oam_server_1c2_mgmt_port_0_network:
       type: list
       required: true
       entry_schema:
-        type: org.openecomp.datatypes.network.VlanRequirements
-    port_oam_port_ip_requirements:
-      type: list
+        type: string
+    port_oam_server_1c2_mgmt_port_0_order:
+      type: integer
       required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.IpRequirements
-    port_oam_port_replacement_policy:
+    port_oam_server_1c2_mgmt_port_0_exCP_naming:
+      type: org.openecomp.datatypes.Naming
+      required: true
+    port_oam_server_1c2_mgmt_port_0_subnetpoolid:
+      type: string
+      required: true
+    port_oam_server_1c2_mgmt_port_0_replacement_policy:
       type: list
       required: true
       entry_schema:
         type: string
-    port_oam_port_network_role_tag:
-      type: string
-      required: true
-    port_oam_port_network_role:
+    port_oam_server_1c2_mgmt_port_0_network_role:
       type: string
       required: true
   node_templates:
-    oam_server_1c2:
-      type: org.openecomp.resource.vfc.compute.nodes.heat.oam_server_1c2
-      properties:
-        availability_zone:
-          get_input:
-          - compute_oam_server_1c2_availability_zone
-          - index_value
-        flavor:
-          get_input: vm_flavor_name
-        image:
-          get_input: vm_image_name
-        name:
-          get_input:
-          - compute_oam_server_1c2_name
-          - index_value
-    oam_server_1c2_oam_port:
+    oam_server_1c2_oam_server_1c2_mgmt_port_0:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         replacement_policy:
           get_input:
-          - port_oam_port_replacement_policy
+          - port_oam_server_1c2_mgmt_port_0_replacement_policy
           - index_value
         mac_requirements:
-          get_input: port_oam_port_mac_requirements
+          get_input: port_oam_server_1c2_mgmt_port_0_mac_requirements
         order:
-          get_input: port_oam_port_order
+          get_input: port_oam_server_1c2_mgmt_port_0_order
         exCP_naming:
-          get_input: port_oam_port_exCP_naming
+          get_input: port_oam_server_1c2_mgmt_port_0_exCP_naming
         vlan_requirements:
-          get_input: port_oam_port_vlan_requirements
+          get_input: port_oam_server_1c2_mgmt_port_0_vlan_requirements
         subinterface_indicator: false
         ip_requirements:
-          get_input: port_oam_port_ip_requirements
+          get_input: port_oam_server_1c2_mgmt_port_0_ip_requirements
         related_networks:
-          get_input: port_oam_port_related_networks
+          get_input: port_oam_server_1c2_mgmt_port_0_related_networks
         network_role_tag:
-          get_input: port_oam_port_network_role_tag
+          get_input: port_oam_server_1c2_mgmt_port_0_network_role_tag
         network_role:
-          get_input: port_oam_port_network_role
+          get_input: port_oam_server_1c2_mgmt_port_0_network_role
         fixed_ips:
           get_input:
-          - port_oam_port_fixed_ips
+          - port_oam_server_1c2_mgmt_port_0_fixed_ips
           - index_value
         subnetpoolid:
-          get_input: port_oam_port_subnetpoolid
+          get_input: port_oam_server_1c2_mgmt_port_0_subnetpoolid
         network:
           get_input:
-          - port_oam_port_network
+          - port_oam_server_1c2_mgmt_port_0_network
           - index_value
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
           node: oam_server_1c2
           relationship: tosca.relationships.network.BindsTo
+    oam_server_1c2:
+      type: org.openecomp.resource.vfc.compute.nodes.heat.oam_server_1c2
+      properties:
+        availability_zone:
+          get_input:
+          - compute_oam_server_1c2_availability_zone
+          - index_value
+        flavor:
+          get_input: vm_flavor_name
+        image:
+          get_input: vm_image_name
+        name:
+          get_input:
+          - compute_oam_server_1c2_name
+          - index_value
   substitution_mappings:
     node_type: org.openecomp.resource.abstract.nodes.oam_server_1c2
     capabilities:
@@ -158,27 +158,18 @@ topology_template:
       disk.device.write.bytes.rate_oam_server_1c2:
       - oam_server_1c2
       - disk.device.write.bytes.rate
-      network.outgoing.packets.rate_oam_server_1c2_oam_port:
-      - oam_server_1c2_oam_port
-      - network.outgoing.packets.rate
-      network.outpoing.packets_oam_server_1c2_oam_port:
-      - oam_server_1c2_oam_port
-      - network.outpoing.packets
       cpu_util_oam_server_1c2:
       - oam_server_1c2
       - cpu_util
       disk.device.write.bytes_oam_server_1c2:
       - oam_server_1c2
       - disk.device.write.bytes
+      binding_oam_server_1c2_oam_server_1c2_mgmt_port_0:
+      - oam_server_1c2_oam_server_1c2_mgmt_port_0
+      - binding
       disk.device.allocation_oam_server_1c2:
       - oam_server_1c2
       - disk.device.allocation
-      attachment_oam_server_1c2_oam_port:
-      - oam_server_1c2_oam_port
-      - attachment
-      network.incoming.bytes.rate_oam_server_1c2_oam_port:
-      - oam_server_1c2_oam_port
-      - network.incoming.bytes.rate
       disk.root.size_oam_server_1c2:
       - oam_server_1c2
       - disk.root.size
@@ -188,33 +179,33 @@ topology_template:
       disk.read.bytes.rate_oam_server_1c2:
       - oam_server_1c2
       - disk.read.bytes.rate
-      network.outgoing.bytes_oam_server_1c2_oam_port:
-      - oam_server_1c2_oam_port
-      - network.outgoing.bytes
+      network.outgoing.bytes.rate_oam_server_1c2_oam_server_1c2_mgmt_port_0:
+      - oam_server_1c2_oam_server_1c2_mgmt_port_0
+      - network.outgoing.bytes.rate
       disk.allocation_oam_server_1c2:
       - oam_server_1c2
       - disk.allocation
       disk.read.bytes_oam_server_1c2:
       - oam_server_1c2
       - disk.read.bytes
-      network.incoming.bytes_oam_server_1c2_oam_port:
-      - oam_server_1c2_oam_port
-      - network.incoming.bytes
-      network.outgoing.bytes.rate_oam_server_1c2_oam_port:
-      - oam_server_1c2_oam_port
-      - network.outgoing.bytes.rate
+      network.incoming.packets_oam_server_1c2_oam_server_1c2_mgmt_port_0:
+      - oam_server_1c2_oam_server_1c2_mgmt_port_0
+      - network.incoming.packets
+      network.incoming.packets.rate_oam_server_1c2_oam_server_1c2_mgmt_port_0:
+      - oam_server_1c2_oam_server_1c2_mgmt_port_0
+      - network.incoming.packets.rate
       vcpus_oam_server_1c2:
       - oam_server_1c2
       - vcpus
       disk.device.read.bytes.rate_oam_server_1c2:
       - oam_server_1c2
       - disk.device.read.bytes.rate
-      network.incoming.packets_oam_server_1c2_oam_port:
-      - oam_server_1c2_oam_port
-      - network.incoming.packets
       cpu_oam_server_1c2:
       - oam_server_1c2
       - cpu
+      network.outpoing.packets_oam_server_1c2_oam_server_1c2_mgmt_port_0:
+      - oam_server_1c2_oam_server_1c2_mgmt_port_0
+      - network.outpoing.packets
       disk.write.requests.rate_oam_server_1c2:
       - oam_server_1c2
       - disk.write.requests.rate
@@ -233,12 +224,12 @@ topology_template:
       endpoint_oam_server_1c2:
       - oam_server_1c2
       - endpoint
-      forwarder_oam_server_1c2_oam_port:
-      - oam_server_1c2_oam_port
-      - forwarder
       disk.ephemeral.size_oam_server_1c2:
       - oam_server_1c2
       - disk.ephemeral.size
+      feature_oam_server_1c2_oam_server_1c2_mgmt_port_0:
+      - oam_server_1c2_oam_server_1c2_mgmt_port_0
+      - feature
       memory.resident_oam_server_1c2:
       - oam_server_1c2
       - memory.resident
@@ -251,27 +242,30 @@ topology_template:
       memory.usage_oam_server_1c2:
       - oam_server_1c2
       - memory.usage
+      attachment_oam_server_1c2_oam_server_1c2_mgmt_port_0:
+      - oam_server_1c2_oam_server_1c2_mgmt_port_0
+      - attachment
       disk.usage_oam_server_1c2:
       - oam_server_1c2
       - disk.usage
-      network.incoming.packets.rate_oam_server_1c2_oam_port:
-      - oam_server_1c2_oam_port
-      - network.incoming.packets.rate
-      binding_oam_server_1c2_oam_port:
-      - oam_server_1c2_oam_port
-      - binding
+      network.outgoing.bytes_oam_server_1c2_oam_server_1c2_mgmt_port_0:
+      - oam_server_1c2_oam_server_1c2_mgmt_port_0
+      - network.outgoing.bytes
       os_oam_server_1c2:
       - oam_server_1c2
       - os
+      forwarder_oam_server_1c2_oam_server_1c2_mgmt_port_0:
+      - oam_server_1c2_oam_server_1c2_mgmt_port_0
+      - forwarder
       disk.device.read.requests_oam_server_1c2:
       - oam_server_1c2
       - disk.device.read.requests
       disk.latency_oam_server_1c2:
       - oam_server_1c2
       - disk.latency
-      feature_oam_server_1c2_oam_port:
-      - oam_server_1c2_oam_port
-      - feature
+      network.incoming.bytes_oam_server_1c2_oam_server_1c2_mgmt_port_0:
+      - oam_server_1c2_oam_server_1c2_mgmt_port_0
+      - network.incoming.bytes
       disk.write.requests_oam_server_1c2:
       - oam_server_1c2
       - disk.write.requests
@@ -290,6 +284,9 @@ topology_template:
       disk.write.bytes_oam_server_1c2:
       - oam_server_1c2
       - disk.write.bytes
+      network.outgoing.packets.rate_oam_server_1c2_oam_server_1c2_mgmt_port_0:
+      - oam_server_1c2_oam_server_1c2_mgmt_port_0
+      - network.outgoing.packets.rate
       disk.capacity_oam_server_1c2:
       - oam_server_1c2
       - disk.capacity
@@ -299,16 +296,19 @@ topology_template:
       disk.iops_oam_server_1c2:
       - oam_server_1c2
       - disk.iops
+      network.incoming.bytes.rate_oam_server_1c2_oam_server_1c2_mgmt_port_0:
+      - oam_server_1c2_oam_server_1c2_mgmt_port_0
+      - network.incoming.bytes.rate
     requirements:
       local_storage_oam_server_1c2:
       - oam_server_1c2
       - local_storage
+      dependency_oam_server_1c2_oam_server_1c2_mgmt_port_0:
+      - oam_server_1c2_oam_server_1c2_mgmt_port_0
+      - dependency
       dependency_oam_server_1c2:
       - oam_server_1c2
       - dependency
-      link_oam_server_1c2_oam_port:
-      - oam_server_1c2_oam_port
+      link_oam_server_1c2_oam_server_1c2_mgmt_port_0:
+      - oam_server_1c2_oam_server_1c2_mgmt_port_0
       - link
-      dependency_oam_server_1c2_oam_port:
-      - oam_server_1c2_oam_port
-      - dependency
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/nested1ServiceTemplate.yaml
index 0b54217586..84767d7fd3 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/nested1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/nested1ServiceTemplate.yaml
@@ -129,7 +129,24 @@ topology_template:
       directives:
       - substitutable
       properties:
-        port_cmaui_port_fixed_ips:
+        port_cmaui_1c1_mgmt_port_0_ip_requirements:
+        - ip_version: 4
+          ip_count_required:
+            is_required: true
+          floating_ip_count_required:
+            is_required: false
+        port_cmaui_1c1_mgmt_port_0_network:
+        - packet_internal_network
+        - packet_internal_network
+        compute_cmaui_1c1_availability_zone:
+        - get_input: availability_zone_0
+        - get_input: availability_zone_0
+        port_cmaui_1c1_mgmt_port_0_mac_requirements:
+          mac_count_required:
+            is_required: false
+        vm_flavor_name:
+          get_input: cmaui_1c1_flavor
+        port_cmaui_1c1_mgmt_port_0_fixed_ips:
         - - ip_address:
               get_input:
               - cmaui_oam_ips
@@ -138,28 +155,11 @@ topology_template:
               get_input:
               - cmaui_oam_ips
               - 0
-        port_cmaui_port_network:
-        - packet_internal_network
-        - packet_internal_network
-        compute_cmaui_1c1_availability_zone:
-        - get_input: availability_zone_0
-        - get_input: availability_zone_0
-        vm_flavor_name:
-          get_input: cmaui_1c1_flavor
-        port_cmaui_port_mac_requirements:
-          mac_count_required:
-            is_required: false
-        port_cmaui_port_replacement_policy:
+        port_cmaui_1c1_mgmt_port_0_replacement_policy:
         - AUTO
         - AUTO
         vm_image_name:
           get_input: cmaui_1c1_image
-        port_cmaui_port_ip_requirements:
-        - ip_version: 4
-          ip_count_required:
-            is_required: true
-          floating_ip_count_required:
-            is_required: false
         compute_cmaui_1c1_name:
         - get_input:
           - cmaui_1c1_names
@@ -176,7 +176,7 @@ topology_template:
           - service_template_filter
           - index_value
       requirements:
-      - link_cmaui_1c1_cmaui_port:
+      - link_cmaui_1c1_cmaui_1c1_mgmt_port_0:
           capability: tosca.capabilities.network.Linkable
           node: packet_internal_network
           relationship: tosca.relationships.network.LinksTo
@@ -277,33 +277,33 @@ topology_template:
       directives:
       - substitutable
       properties:
-        port_oam_port_mac_requirements:
-          mac_count_required:
-            is_required: false
         compute_oam_server_1c2_name:
         - get_input:
           - oam_server_1c2_names
           - 1
-        port_oam_port_network:
-        - packet_external_network
-        vm_flavor_name:
-          get_input: oam_server_1c2_flavor
-        compute_oam_server_1c2_availability_zone:
-        - get_input: availability_zone_0
-        port_oam_port_fixed_ips:
+        port_oam_server_1c2_mgmt_port_0_ip_requirements:
+        - ip_version: 4
+          ip_count_required:
+            is_required: true
+          floating_ip_count_required:
+            is_required: false
+        port_oam_server_1c2_mgmt_port_0_fixed_ips:
         - ip_address:
             get_input:
             - cmaui_oam_ips
             - 1
+        vm_flavor_name:
+          get_input: oam_server_1c2_flavor
+        port_oam_server_1c2_mgmt_port_0_mac_requirements:
+          mac_count_required:
+            is_required: false
+        compute_oam_server_1c2_availability_zone:
+        - get_input: availability_zone_0
         vm_image_name:
           get_input: oam_server_1c2_image
-        port_oam_port_ip_requirements:
-        - ip_version: 4
-          ip_count_required:
-            is_required: true
-          floating_ip_count_required:
-            is_required: false
-        port_oam_port_replacement_policy:
+        port_oam_server_1c2_mgmt_port_0_network:
+        - packet_external_network
+        port_oam_server_1c2_mgmt_port_0_replacement_policy:
         - AUTO
         service_template_filter:
           substitute_service_template: Nested_oam_server_1c2ServiceTemplate.yaml
@@ -314,7 +314,7 @@ topology_template:
           - service_template_filter
           - index_value
       requirements:
-      - link_oam_server_1c2_oam_port:
+      - link_oam_server_1c2_oam_server_1c2_mgmt_port_0:
           capability: tosca.capabilities.network.Linkable
           node: packet_external_network
           relationship: tosca.relationships.network.LinksTo
@@ -323,33 +323,33 @@ topology_template:
       directives:
       - substitutable
       properties:
-        port_oam_port_mac_requirements:
-          mac_count_required:
-            is_required: false
         compute_oam_server_1c2_name:
         - get_input:
           - oam_server_1c2_names
           - 0
-        port_oam_port_network:
-        - packet_internal_network
-        vm_flavor_name:
-          get_input: oam_server_1c2_flavor
-        compute_oam_server_1c2_availability_zone:
-        - get_input: availability_zone_0
-        port_oam_port_fixed_ips:
+        port_oam_server_1c2_mgmt_port_0_ip_requirements:
+        - ip_version: 4
+          ip_count_required:
+            is_required: true
+          floating_ip_count_required:
+            is_required: false
+        port_oam_server_1c2_mgmt_port_0_fixed_ips:
         - ip_address:
             get_input:
             - cmaui_oam_ips
             - 1
+        vm_flavor_name:
+          get_input: oam_server_1c2_flavor
+        port_oam_server_1c2_mgmt_port_0_mac_requirements:
+          mac_count_required:
+            is_required: false
+        compute_oam_server_1c2_availability_zone:
+        - get_input: availability_zone_0
         vm_image_name:
           get_input: oam_server_1c2_image
-        port_oam_port_ip_requirements:
-        - ip_version: 4
-          ip_count_required:
-            is_required: true
-          floating_ip_count_required:
-            is_required: false
-        port_oam_port_replacement_policy:
+        port_oam_server_1c2_mgmt_port_0_network:
+        - packet_internal_network
+        port_oam_server_1c2_mgmt_port_0_replacement_policy:
         - AUTO
         service_template_filter:
           substitute_service_template: Nested_oam_server_1c2ServiceTemplate.yaml
@@ -360,7 +360,7 @@ topology_template:
           - service_template_filter
           - index_value
       requirements:
-      - link_oam_server_1c2_oam_port:
+      - link_oam_server_1c2_oam_server_1c2_mgmt_port_0:
           capability: tosca.capabilities.network.Linkable
           node: packet_internal_network
           relationship: tosca.relationships.network.LinksTo
@@ -384,6 +384,9 @@ topology_template:
       disk.capacity_server_1b_pd:
       - abstract_pd_server_1b
       - disk.capacity_pd_server_1b
+      network.incoming.packets_oam_server_1c2_1_mgmt_port_0:
+      - abstract_oam_server_1c2_0
+      - network.incoming.packets_oam_server_1c2_oam_server_1c2_mgmt_port_0
       disk.device.write.bytes.rate_server_1c2_oam_2:
       - abstract_oam_server_1c2_1
       - disk.device.write.bytes.rate_oam_server_1c2
@@ -402,15 +405,27 @@ topology_template:
       disk.usage_server_1b_pd:
       - abstract_pd_server_1b
       - disk.usage_pd_server_1b
+      network.incoming.packets_oam_server_1c2_2_mgmt_port_0:
+      - abstract_oam_server_1c2_1
+      - network.incoming.packets_oam_server_1c2_oam_server_1c2_mgmt_port_0
+      feature_cmaui_1c1_1_mgmt_port_0:
+      - abstract_cmaui_1c1
+      - feature_cmaui_1c1_cmaui_1c1_mgmt_port_0
       disk.iops_server_1c2_oam_2:
       - abstract_oam_server_1c2_1
       - disk.iops_oam_server_1c2
       disk.usage_server_1c2_oam_2:
       - abstract_oam_server_1c2_1
       - disk.usage_oam_server_1c2
+      network.outgoing.bytes_cmaui_1c1_1_mgmt_port_0:
+      - abstract_cmaui_1c1
+      - network.outgoing.bytes_cmaui_1c1_cmaui_1c1_mgmt_port_0
       disk.read.requests_server_1c1_cmaui_2:
       - abstract_cmaui_1c1
       - disk.read.requests_cmaui_1c1
+      network.outgoing.bytes_cmaui_1c1_2_mgmt_port_0:
+      - abstract_cmaui_1c1
+      - network.outgoing.bytes_cmaui_1c1_cmaui_1c1_mgmt_port_0
       feature_server_1c1_cmaui_1:
       - abstract_cmaui_1c1
       - feature_cmaui_1c1
@@ -429,21 +444,12 @@ topology_template:
       disk.device.iops_server_1b_ps:
       - abstract_ps_server_1b
       - disk.device.iops_ps_server_1b
-      network.outgoing.bytes_cmaui_port_2:
-      - abstract_cmaui_1c1
-      - network.outgoing.bytes_cmaui_1c1_cmaui_port
       disk.iops_server_1c2_oam_1:
       - abstract_oam_server_1c2_0
       - disk.iops_oam_server_1c2
-      network.outgoing.bytes_cmaui_port_1:
+      feature_cmaui_1c1_2_mgmt_port_0:
       - abstract_cmaui_1c1
-      - network.outgoing.bytes_cmaui_1c1_cmaui_port
-      network.outgoing.packets.rate_oam_port_2:
-      - abstract_oam_server_1c2_1
-      - network.outgoing.packets.rate_oam_server_1c2_oam_port
-      network.outgoing.packets.rate_oam_port_1:
-      - abstract_oam_server_1c2_0
-      - network.outgoing.packets.rate_oam_server_1c2_oam_port
+      - feature_cmaui_1c1_cmaui_1c1_mgmt_port_0
       disk.device.iops_server_1b_pd:
       - abstract_pd_server_1b
       - disk.device.iops_pd_server_1b
@@ -483,6 +489,9 @@ topology_template:
       disk.device.read.requests.rate_server_1b_pd:
       - abstract_pd_server_1b
       - disk.device.read.requests.rate_pd_server_1b
+      network.outgoing.packets.rate_oam_server_1c2_2_mgmt_port_0:
+      - abstract_oam_server_1c2_1
+      - network.outgoing.packets.rate_oam_server_1c2_oam_server_1c2_mgmt_port_0
       disk.device.write.requests_server_1c1_cmaui_2:
       - abstract_cmaui_1c1
       - disk.device.write.requests_cmaui_1c1
@@ -495,6 +504,9 @@ topology_template:
       disk.device.read.bytes_server_1c1_cmaui_1:
       - abstract_cmaui_1c1
       - disk.device.read.bytes_cmaui_1c1
+      network.incoming.packets.rate_oam_server_1c2_1_mgmt_port_0:
+      - abstract_oam_server_1c2_0
+      - network.incoming.packets.rate_oam_server_1c2_oam_server_1c2_mgmt_port_0
       disk.device.read.requests.rate_server_1b_ps:
       - abstract_ps_server_1b
       - disk.device.read.requests.rate_ps_server_1b
@@ -519,18 +531,6 @@ topology_template:
       memory.usage_server_1b_pd:
       - abstract_pd_server_1b
       - memory.usage_pd_server_1b
-      network.outpoing.packets_oam_port_1:
-      - abstract_oam_server_1c2_0
-      - network.outpoing.packets_oam_server_1c2_oam_port
-      network.outpoing.packets_oam_port_2:
-      - abstract_oam_server_1c2_1
-      - network.outpoing.packets_oam_server_1c2_oam_port
-      binding_cmaui_port_1:
-      - abstract_cmaui_1c1
-      - binding_cmaui_1c1_cmaui_port
-      binding_cmaui_port_2:
-      - abstract_cmaui_1c1
-      - binding_cmaui_1c1_cmaui_port
       memory.usage_server_1b_ps:
       - abstract_ps_server_1b
       - memory.usage_ps_server_1b
@@ -543,6 +543,9 @@ topology_template:
       cpu_util_server_1c2_oam_2:
       - abstract_oam_server_1c2_1
       - cpu_util_oam_server_1c2
+      network.incoming.packets.rate_oam_server_1c2_2_mgmt_port_0:
+      - abstract_oam_server_1c2_1
+      - network.incoming.packets.rate_oam_server_1c2_oam_server_1c2_mgmt_port_0
       memory_server_1c2_oam_1:
       - abstract_oam_server_1c2_0
       - memory_oam_server_1c2
@@ -564,12 +567,9 @@ topology_template:
       cpu_util_server_1b_ps:
       - abstract_ps_server_1b
       - cpu_util_ps_server_1b
-      network.incoming.bytes_cmaui_port_2:
-      - abstract_cmaui_1c1
-      - network.incoming.bytes_cmaui_1c1_cmaui_port
-      network.incoming.bytes_cmaui_port_1:
-      - abstract_cmaui_1c1
-      - network.incoming.bytes_cmaui_1c1_cmaui_port
+      network.outgoing.packets.rate_oam_server_1c2_1_mgmt_port_0:
+      - abstract_oam_server_1c2_0
+      - network.outgoing.packets.rate_oam_server_1c2_oam_server_1c2_mgmt_port_0
       os_server_1c2_oam_1:
       - abstract_oam_server_1c2_0
       - os_oam_server_1c2
@@ -597,39 +597,24 @@ topology_template:
       feature_server_1c2_oam_2:
       - abstract_oam_server_1c2_1
       - feature_oam_server_1c2
+      network.incoming.bytes_cmaui_1c1_1_mgmt_port_0:
+      - abstract_cmaui_1c1
+      - network.incoming.bytes_cmaui_1c1_cmaui_1c1_mgmt_port_0
       disk.device.write.bytes_server_1b_ps:
       - abstract_ps_server_1b
       - disk.device.write.bytes_ps_server_1b
-      network.incoming.packets.rate_cmaui_port_1:
-      - abstract_cmaui_1c1
-      - network.incoming.packets.rate_cmaui_1c1_cmaui_port
       vcpus_server_1c1_cmaui_1:
       - abstract_cmaui_1c1
       - vcpus_cmaui_1c1
-      network.incoming.packets.rate_cmaui_port_2:
-      - abstract_cmaui_1c1
-      - network.incoming.packets.rate_cmaui_1c1_cmaui_port
-      feature_cmaui_port_1:
-      - abstract_cmaui_1c1
-      - feature_cmaui_1c1_cmaui_port
       network.incoming.bytes.rate_pd_server_1b_port:
       - abstract_pd_server_1b
       - network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port
-      network.outgoing.bytes_oam_port_2:
-      - abstract_oam_server_1c2_1
-      - network.outgoing.bytes_oam_server_1c2_oam_port
-      feature_cmaui_port_2:
-      - abstract_cmaui_1c1
-      - feature_cmaui_1c1_cmaui_port
       instance_server_1b_ps:
       - abstract_ps_server_1b
       - instance_ps_server_1b
       feature_server_1c2_oam_1:
       - abstract_oam_server_1c2_0
       - feature_oam_server_1c2
-      network.outgoing.bytes_oam_port_1:
-      - abstract_oam_server_1c2_0
-      - network.outgoing.bytes_oam_server_1c2_oam_port
       disk.device.capacity_server_1c1_cmaui_2:
       - abstract_cmaui_1c1
       - disk.device.capacity_cmaui_1c1
@@ -639,18 +624,24 @@ topology_template:
       cpu.delta_server_1b_ps:
       - abstract_ps_server_1b
       - cpu.delta_ps_server_1b
+      network.outgoing.bytes.rate_oam_server_1c2_2_mgmt_port_0:
+      - abstract_oam_server_1c2_1
+      - network.outgoing.bytes.rate_oam_server_1c2_oam_server_1c2_mgmt_port_0
+      network.outgoing.packets.rate_cmaui_1c1_1_mgmt_port_0:
+      - abstract_cmaui_1c1
+      - network.outgoing.packets.rate_cmaui_1c1_cmaui_1c1_mgmt_port_0
       instance_server_1c1_cmaui_1:
       - abstract_cmaui_1c1
       - instance_cmaui_1c1
+      attachment_cmaui_1c1_1_mgmt_port_0:
+      - abstract_cmaui_1c1
+      - attachment_cmaui_1c1_cmaui_1c1_mgmt_port_0
       disk.device.read.requests.rate_server_1c2_oam_1:
       - abstract_oam_server_1c2_0
       - disk.device.read.requests.rate_oam_server_1c2
       disk.device.read.requests.rate_server_1c2_oam_2:
       - abstract_oam_server_1c2_1
       - disk.device.read.requests.rate_oam_server_1c2
-      attachment_oam_port_2:
-      - abstract_oam_server_1c2_1
-      - attachment_oam_server_1c2_oam_port
       disk.device.write.bytes.rate_server_1b_pd:
       - abstract_pd_server_1b
       - disk.device.write.bytes.rate_pd_server_1b
@@ -663,9 +654,15 @@ topology_template:
       cpu.delta_server_1b_pd:
       - abstract_pd_server_1b
       - cpu.delta_pd_server_1b
-      attachment_oam_port_1:
+      binding_oam_server_1c2_2_mgmt_port_0:
+      - abstract_oam_server_1c2_1
+      - binding_oam_server_1c2_oam_server_1c2_mgmt_port_0
+      network.outpoing.packets_oam_server_1c2_1_mgmt_port_0:
+      - abstract_oam_server_1c2_0
+      - network.outpoing.packets_oam_server_1c2_oam_server_1c2_mgmt_port_0
+      attachment_oam_server_1c2_1_mgmt_port_0:
       - abstract_oam_server_1c2_0
-      - attachment_oam_server_1c2_oam_port
+      - attachment_oam_server_1c2_oam_server_1c2_mgmt_port_0
       disk.device.write.requests_server_1b_pd:
       - abstract_pd_server_1b
       - disk.device.write.requests_pd_server_1b
@@ -702,18 +699,15 @@ topology_template:
       vcpus_server_1c1_cmaui_2:
       - abstract_cmaui_1c1
       - vcpus_cmaui_1c1
+      network.incoming.packets_cmaui_1c1_2_mgmt_port_0:
+      - abstract_cmaui_1c1
+      - network.incoming.packets_cmaui_1c1_cmaui_1c1_mgmt_port_0
       binding_ps_server_1b_port:
       - abstract_ps_server_1b
       - binding_ps_server_1b_ps_server_1b_port
       disk.device.write.bytes.rate_server_1b_ps:
       - abstract_ps_server_1b
       - disk.device.write.bytes.rate_ps_server_1b
-      forwarder_cmaui_port_2:
-      - abstract_cmaui_1c1
-      - forwarder_cmaui_1c1_cmaui_port
-      forwarder_cmaui_port_1:
-      - abstract_cmaui_1c1
-      - forwarder_cmaui_1c1_cmaui_port
       disk.device.write.requests_server_1b_ps:
       - abstract_ps_server_1b
       - disk.device.write.requests_ps_server_1b
@@ -735,12 +729,21 @@ topology_template:
       disk.device.read.requests_server_1b_pd:
       - abstract_pd_server_1b
       - disk.device.read.requests_pd_server_1b
+      binding_cmaui_1c1_2_mgmt_port_0:
+      - abstract_cmaui_1c1
+      - binding_cmaui_1c1_cmaui_1c1_mgmt_port_0
+      network.outgoing.bytes_oam_server_1c2_1_mgmt_port_0:
+      - abstract_oam_server_1c2_0
+      - network.outgoing.bytes_oam_server_1c2_oam_server_1c2_mgmt_port_0
       disk.read.requests_server_1b_pd:
       - abstract_pd_server_1b
       - disk.read.requests_pd_server_1b
       cpu_util_server_1c1_cmaui_2:
       - abstract_cmaui_1c1
       - cpu_util_cmaui_1c1
+      network.incoming.bytes_oam_server_1c2_1_mgmt_port_0:
+      - abstract_oam_server_1c2_0
+      - network.incoming.bytes_oam_server_1c2_oam_server_1c2_mgmt_port_0
       disk.allocation_server_1c2_oam_2:
       - abstract_oam_server_1c2_1
       - disk.allocation_oam_server_1c2
@@ -765,9 +768,6 @@ topology_template:
       cpu_server_1b_pd:
       - abstract_pd_server_1b
       - cpu_pd_server_1b
-      binding_oam_port_2:
-      - abstract_oam_server_1c2_1
-      - binding_oam_server_1c2_oam_port
       disk.write.bytes.rate_server_1c1_cmaui_1:
       - abstract_cmaui_1c1
       - disk.write.bytes.rate_cmaui_1c1
@@ -777,9 +777,12 @@ topology_template:
       disk.allocation_server_1b_pd:
       - abstract_pd_server_1b
       - disk.allocation_pd_server_1b
-      binding_oam_port_1:
+      feature_oam_server_1c2_2_mgmt_port_0:
+      - abstract_oam_server_1c2_1
+      - feature_oam_server_1c2_oam_server_1c2_mgmt_port_0
+      forwarder_oam_server_1c2_1_mgmt_port_0:
       - abstract_oam_server_1c2_0
-      - binding_oam_server_1c2_oam_port
+      - forwarder_oam_server_1c2_oam_server_1c2_mgmt_port_0
       disk.read.bytes.rate_server_1c1_cmaui_2:
       - abstract_cmaui_1c1
       - disk.read.bytes.rate_cmaui_1c1
@@ -795,15 +798,9 @@ topology_template:
       cpu_server_1b_ps:
       - abstract_ps_server_1b
       - cpu_ps_server_1b
-      network.outpoing.packets_cmaui_port_1:
-      - abstract_cmaui_1c1
-      - network.outpoing.packets_cmaui_1c1_cmaui_port
       disk.allocation_server_1b_ps:
       - abstract_ps_server_1b
       - disk.allocation_ps_server_1b
-      network.outpoing.packets_cmaui_port_2:
-      - abstract_cmaui_1c1
-      - network.outpoing.packets_cmaui_1c1_cmaui_port
       disk.latency_server_1c2_oam_1:
       - abstract_oam_server_1c2_0
       - disk.latency_oam_server_1c2
@@ -843,6 +840,9 @@ topology_template:
       memory.resident_server_1c1_cmaui_2:
       - abstract_cmaui_1c1
       - memory.resident_cmaui_1c1
+      network.incoming.bytes.rate_cmaui_1c1_2_mgmt_port_0:
+      - abstract_cmaui_1c1
+      - network.incoming.bytes.rate_cmaui_1c1_cmaui_1c1_mgmt_port_0
       disk.root.size_server_1c2_oam_2:
       - abstract_oam_server_1c2_1
       - disk.root.size_oam_server_1c2
@@ -852,27 +852,33 @@ topology_template:
       network.incoming.bytes.rate_ps_server_1b_port:
       - abstract_ps_server_1b
       - network.incoming.bytes.rate_ps_server_1b_ps_server_1b_port
-      network.incoming.bytes.rate_oam_port_1:
-      - abstract_oam_server_1c2_0
-      - network.incoming.bytes.rate_oam_server_1c2_oam_port
       os_server_1c1_cmaui_2:
       - abstract_cmaui_1c1
       - os_cmaui_1c1
+      network.incoming.bytes.rate_oam_server_1c2_1_mgmt_port_0:
+      - abstract_oam_server_1c2_0
+      - network.incoming.bytes.rate_oam_server_1c2_oam_server_1c2_mgmt_port_0
       os_server_1c1_cmaui_1:
       - abstract_cmaui_1c1
       - os_cmaui_1c1
       instance_server_1c2_oam_1:
       - abstract_oam_server_1c2_0
       - instance_oam_server_1c2
+      network.incoming.bytes.rate_cmaui_1c1_1_mgmt_port_0:
+      - abstract_cmaui_1c1
+      - network.incoming.bytes.rate_cmaui_1c1_cmaui_1c1_mgmt_port_0
+      network.outgoing.bytes.rate_cmaui_1c1_1_mgmt_port_0:
+      - abstract_cmaui_1c1
+      - network.outgoing.bytes.rate_cmaui_1c1_cmaui_1c1_mgmt_port_0
       instance_server_1c2_oam_2:
       - abstract_oam_server_1c2_1
       - instance_oam_server_1c2
-      network.incoming.bytes.rate_oam_port_2:
-      - abstract_oam_server_1c2_1
-      - network.incoming.bytes.rate_oam_server_1c2_oam_port
       vcpus_server_1b_pd:
       - abstract_pd_server_1b
       - vcpus_pd_server_1b
+      network.outgoing.bytes.rate_cmaui_1c1_2_mgmt_port_0:
+      - abstract_cmaui_1c1
+      - network.outgoing.bytes.rate_cmaui_1c1_cmaui_1c1_mgmt_port_0
       memory.usage_server_1c1_cmaui_1:
       - abstract_cmaui_1c1
       - memory.usage_cmaui_1c1
@@ -906,12 +912,6 @@ topology_template:
       disk.write.bytes.rate_server_1b_pd:
       - abstract_pd_server_1b
       - disk.write.bytes.rate_pd_server_1b
-      forwarder_oam_port_1:
-      - abstract_oam_server_1c2_0
-      - forwarder_oam_server_1c2_oam_port
-      forwarder_oam_port_2:
-      - abstract_oam_server_1c2_1
-      - forwarder_oam_server_1c2_oam_port
       binding_server_1c2_oam_2:
       - abstract_oam_server_1c2_1
       - binding_oam_server_1c2
@@ -924,6 +924,9 @@ topology_template:
       attachment_packet_internal_network:
       - packet_internal_network
       - attachment
+      forwarder_cmaui_1c1_1_mgmt_port_0:
+      - abstract_cmaui_1c1
+      - forwarder_cmaui_1c1_cmaui_1c1_mgmt_port_0
       network.outgoing.packets.rate_pd_server_1b_port:
       - abstract_pd_server_1b
       - network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port
@@ -939,6 +942,9 @@ topology_template:
       disk.device.usage_server_1b_pd:
       - abstract_pd_server_1b
       - disk.device.usage_pd_server_1b
+      forwarder_cmaui_1c1_2_mgmt_port_0:
+      - abstract_cmaui_1c1
+      - forwarder_cmaui_1c1_cmaui_1c1_mgmt_port_0
       disk.write.requests_server_1c2_oam_1:
       - abstract_oam_server_1c2_0
       - disk.write.requests_oam_server_1c2
@@ -951,6 +957,9 @@ topology_template:
       os_server_1b_ps:
       - abstract_ps_server_1b
       - os_ps_server_1b
+      network.incoming.bytes.rate_oam_server_1c2_2_mgmt_port_0:
+      - abstract_oam_server_1c2_1
+      - network.incoming.bytes.rate_oam_server_1c2_oam_server_1c2_mgmt_port_0
       disk.device.latency_server_1b_ps:
       - abstract_ps_server_1b
       - disk.device.latency_ps_server_1b
@@ -972,9 +981,6 @@ topology_template:
       disk.read.bytes_server_1b_ps:
       - abstract_ps_server_1b
       - disk.read.bytes_ps_server_1b
-      network.incoming.packets_cmaui_port_2:
-      - abstract_cmaui_1c1
-      - network.incoming.packets_cmaui_1c1_cmaui_port
       disk.device.write.bytes.rate_server_1c1_cmaui_2:
       - abstract_cmaui_1c1
       - disk.device.write.bytes.rate_cmaui_1c1
@@ -984,15 +990,18 @@ topology_template:
       disk.device.write.requests_server_1c2_oam_2:
       - abstract_oam_server_1c2_1
       - disk.device.write.requests_oam_server_1c2
+      network.incoming.packets.rate_cmaui_1c1_1_mgmt_port_0:
+      - abstract_cmaui_1c1
+      - network.incoming.packets.rate_cmaui_1c1_cmaui_1c1_mgmt_port_0
       disk.allocation_server_1c1_cmaui_1:
       - abstract_cmaui_1c1
       - disk.allocation_cmaui_1c1
       memory_server_1b_ps:
       - abstract_ps_server_1b
       - memory_ps_server_1b
-      network.incoming.packets_cmaui_port_1:
+      network.incoming.packets.rate_cmaui_1c1_2_mgmt_port_0:
       - abstract_cmaui_1c1
-      - network.incoming.packets_cmaui_1c1_cmaui_port
+      - network.incoming.packets.rate_cmaui_1c1_cmaui_1c1_mgmt_port_0
       network.outgoing.bytes.rate_ps_server_1b_port:
       - abstract_ps_server_1b
       - network.outgoing.bytes.rate_ps_server_1b_ps_server_1b_port
@@ -1047,15 +1056,9 @@ topology_template:
       host_server_1c2_oam_2:
       - abstract_oam_server_1c2_1
       - host_oam_server_1c2
-      network.incoming.packets.rate_oam_port_1:
-      - abstract_oam_server_1c2_0
-      - network.incoming.packets.rate_oam_server_1c2_oam_port
       disk.write.bytes_server_1b_ps:
       - abstract_ps_server_1b
       - disk.write.bytes_ps_server_1b
-      network.incoming.packets.rate_oam_port_2:
-      - abstract_oam_server_1c2_1
-      - network.incoming.packets.rate_oam_server_1c2_oam_port
       end_point_packet_external_network:
       - packet_external_network
       - end_point
@@ -1074,6 +1077,12 @@ topology_template:
       disk.device.read.requests_server_1c1_cmaui_1:
       - abstract_cmaui_1c1
       - disk.device.read.requests_cmaui_1c1
+      network.outpoing.packets_cmaui_1c1_2_mgmt_port_0:
+      - abstract_cmaui_1c1
+      - network.outpoing.packets_cmaui_1c1_cmaui_1c1_mgmt_port_0
+      network.outpoing.packets_cmaui_1c1_1_mgmt_port_0:
+      - abstract_cmaui_1c1
+      - network.outpoing.packets_cmaui_1c1_cmaui_1c1_mgmt_port_0
       disk.device.allocation_server_1b_pd:
       - abstract_pd_server_1b
       - disk.device.allocation_pd_server_1b
@@ -1101,18 +1110,12 @@ topology_template:
       disk.device.capacity_server_1b_pd:
       - abstract_pd_server_1b
       - disk.device.capacity_pd_server_1b
-      network.outgoing.bytes.rate_cmaui_port_2:
-      - abstract_cmaui_1c1
-      - network.outgoing.bytes.rate_cmaui_1c1_cmaui_port
       disk.root.size_server_1b_pd:
       - abstract_pd_server_1b
       - disk.root.size_pd_server_1b
       cpu_server_1c1_cmaui_2:
       - abstract_cmaui_1c1
       - cpu_cmaui_1c1
-      network.outgoing.bytes.rate_cmaui_port_1:
-      - abstract_cmaui_1c1
-      - network.outgoing.bytes.rate_cmaui_1c1_cmaui_port
       cpu_server_1c1_cmaui_1:
       - abstract_cmaui_1c1
       - cpu_cmaui_1c1
@@ -1143,15 +1146,24 @@ topology_template:
       disk.write.requests.rate_server_1c2_oam_2:
       - abstract_oam_server_1c2_1
       - disk.write.requests.rate_oam_server_1c2
+      attachment_cmaui_1c1_2_mgmt_port_0:
+      - abstract_cmaui_1c1
+      - attachment_cmaui_1c1_cmaui_1c1_mgmt_port_0
       cpu.delta_server_1c2_oam_2:
       - abstract_oam_server_1c2_1
       - cpu.delta_oam_server_1c2
+      network.outgoing.bytes.rate_oam_server_1c2_1_mgmt_port_0:
+      - abstract_oam_server_1c2_0
+      - network.outgoing.bytes.rate_oam_server_1c2_oam_server_1c2_mgmt_port_0
       disk.iops_server_1b_pd:
       - abstract_pd_server_1b
       - disk.iops_pd_server_1b
       disk.write.requests.rate_server_1c2_oam_1:
       - abstract_oam_server_1c2_0
       - disk.write.requests.rate_oam_server_1c2
+      network.incoming.bytes_cmaui_1c1_2_mgmt_port_0:
+      - abstract_cmaui_1c1
+      - network.incoming.bytes_cmaui_1c1_cmaui_1c1_mgmt_port_0
       disk.usage_server_1c1_cmaui_2:
       - abstract_cmaui_1c1
       - disk.usage_cmaui_1c1
@@ -1164,45 +1176,24 @@ topology_template:
       end_point_packet_internal_network:
       - packet_internal_network
       - end_point
-      network.incoming.bytes_oam_port_2:
-      - abstract_oam_server_1c2_1
-      - network.incoming.bytes_oam_server_1c2_oam_port
+      network.outgoing.packets.rate_cmaui_1c1_2_mgmt_port_0:
+      - abstract_cmaui_1c1
+      - network.outgoing.packets.rate_cmaui_1c1_cmaui_1c1_mgmt_port_0
       feature_packet_internal_network:
       - packet_internal_network
       - feature
-      network.incoming.bytes_oam_port_1:
-      - abstract_oam_server_1c2_0
-      - network.incoming.bytes_oam_server_1c2_oam_port
       forwarder_pd_server_1b_port:
       - abstract_pd_server_1b
       - forwarder_pd_server_1b_pd_server_1b_port
       disk.device.write.requests.rate_server_1b_ps:
       - abstract_ps_server_1b
       - disk.device.write.requests.rate_ps_server_1b
-      attachment_cmaui_port_2:
-      - abstract_cmaui_1c1
-      - attachment_cmaui_1c1_cmaui_port
-      network.outgoing.bytes.rate_oam_port_1:
-      - abstract_oam_server_1c2_0
-      - network.outgoing.bytes.rate_oam_server_1c2_oam_port
-      network.outgoing.bytes.rate_oam_port_2:
-      - abstract_oam_server_1c2_1
-      - network.outgoing.bytes.rate_oam_server_1c2_oam_port
       disk.iops_server_1b_ps:
       - abstract_ps_server_1b
       - disk.iops_ps_server_1b
       disk.capacity_server_1c1_cmaui_1:
       - abstract_cmaui_1c1
       - disk.capacity_cmaui_1c1
-      network.outgoing.packets.rate_cmaui_port_1:
-      - abstract_cmaui_1c1
-      - network.outgoing.packets.rate_cmaui_1c1_cmaui_port
-      network.outgoing.packets.rate_cmaui_port_2:
-      - abstract_cmaui_1c1
-      - network.outgoing.packets.rate_cmaui_1c1_cmaui_port
-      attachment_cmaui_port_1:
-      - abstract_cmaui_1c1
-      - attachment_cmaui_1c1_cmaui_port
       disk.capacity_server_1c1_cmaui_2:
       - abstract_cmaui_1c1
       - disk.capacity_cmaui_1c1
@@ -1215,6 +1206,9 @@ topology_template:
       disk.ephemeral.size_server_1c2_oam_1:
       - abstract_oam_server_1c2_0
       - disk.ephemeral.size_oam_server_1c2
+      binding_oam_server_1c2_1_mgmt_port_0:
+      - abstract_oam_server_1c2_0
+      - binding_oam_server_1c2_oam_server_1c2_mgmt_port_0
       disk.device.read.requests.rate_server_1c1_cmaui_1:
       - abstract_cmaui_1c1
       - disk.device.read.requests.rate_cmaui_1c1
@@ -1227,12 +1221,18 @@ topology_template:
       disk.device.read.requests.rate_server_1c1_cmaui_2:
       - abstract_cmaui_1c1
       - disk.device.read.requests.rate_cmaui_1c1
+      attachment_oam_server_1c2_2_mgmt_port_0:
+      - abstract_oam_server_1c2_1
+      - attachment_oam_server_1c2_oam_server_1c2_mgmt_port_0
       network.incoming.packets_ps_server_1b_port:
       - abstract_ps_server_1b
       - network.incoming.packets_ps_server_1b_ps_server_1b_port
       disk.write.requests_server_1b_ps:
       - abstract_ps_server_1b
       - disk.write.requests_ps_server_1b
+      network.incoming.packets_cmaui_1c1_1_mgmt_port_0:
+      - abstract_cmaui_1c1
+      - network.incoming.packets_cmaui_1c1_cmaui_1c1_mgmt_port_0
       feature_pd_server_1b_port:
       - abstract_pd_server_1b
       - feature_pd_server_1b_pd_server_1b_port
@@ -1272,12 +1272,15 @@ topology_template:
       disk.write.bytes_server_1c1_cmaui_2:
       - abstract_cmaui_1c1
       - disk.write.bytes_cmaui_1c1
-      feature_oam_port_2:
+      network.outgoing.bytes_oam_server_1c2_2_mgmt_port_0:
       - abstract_oam_server_1c2_1
-      - feature_oam_server_1c2_oam_port
-      feature_oam_port_1:
-      - abstract_oam_server_1c2_0
-      - feature_oam_server_1c2_oam_port
+      - network.outgoing.bytes_oam_server_1c2_oam_server_1c2_mgmt_port_0
+      binding_cmaui_1c1_1_mgmt_port_0:
+      - abstract_cmaui_1c1
+      - binding_cmaui_1c1_cmaui_1c1_mgmt_port_0
+      network.incoming.bytes_oam_server_1c2_2_mgmt_port_0:
+      - abstract_oam_server_1c2_1
+      - network.incoming.bytes_oam_server_1c2_oam_server_1c2_mgmt_port_0
       network.incoming.packets.rate_pd_server_1b_port:
       - abstract_pd_server_1b
       - network.incoming.packets.rate_pd_server_1b_pd_server_1b_port
@@ -1290,6 +1293,9 @@ topology_template:
       scalable_server_1c1_cmaui_1:
       - abstract_cmaui_1c1
       - scalable_cmaui_1c1
+      feature_oam_server_1c2_1_mgmt_port_0:
+      - abstract_oam_server_1c2_0
+      - feature_oam_server_1c2_oam_server_1c2_mgmt_port_0
       link_packet_internal_network:
       - packet_internal_network
       - link
@@ -1308,24 +1314,18 @@ topology_template:
       cpu.delta_server_1c1_cmaui_1:
       - abstract_cmaui_1c1
       - cpu.delta_cmaui_1c1
+      network.outpoing.packets_oam_server_1c2_2_mgmt_port_0:
+      - abstract_oam_server_1c2_1
+      - network.outpoing.packets_oam_server_1c2_oam_server_1c2_mgmt_port_0
       endpoint_server_1b_ps:
       - abstract_ps_server_1b
       - endpoint_ps_server_1b
-      network.incoming.packets_oam_port_1:
-      - abstract_oam_server_1c2_0
-      - network.incoming.packets_oam_server_1c2_oam_port
-      network.incoming.packets_oam_port_2:
+      forwarder_oam_server_1c2_2_mgmt_port_0:
       - abstract_oam_server_1c2_1
-      - network.incoming.packets_oam_server_1c2_oam_port
-      network.incoming.bytes.rate_cmaui_port_1:
-      - abstract_cmaui_1c1
-      - network.incoming.bytes.rate_cmaui_1c1_cmaui_port
+      - forwarder_oam_server_1c2_oam_server_1c2_mgmt_port_0
       network.outgoing.bytes_ps_server_1b_port:
       - abstract_ps_server_1b
       - network.outgoing.bytes_ps_server_1b_ps_server_1b_port
-      network.incoming.bytes.rate_cmaui_port_2:
-      - abstract_cmaui_1c1
-      - network.incoming.bytes.rate_cmaui_1c1_cmaui_port
       disk.device.read.bytes_server_1b_ps:
       - abstract_ps_server_1b
       - disk.device.read.bytes_ps_server_1b
@@ -1369,12 +1369,6 @@ topology_template:
       local_storage_server_1b_ps:
       - abstract_ps_server_1b
       - local_storage_ps_server_1b
-      dependency_oam_port_2:
-      - abstract_oam_server_1c2_1
-      - dependency_oam_server_1c2_oam_port
-      dependency_oam_port_1:
-      - abstract_oam_server_1c2_0
-      - dependency_oam_server_1c2_oam_port
       dependency_server_1c1_cmaui_1:
       - abstract_cmaui_1c1
       - dependency_cmaui_1c1
@@ -1384,9 +1378,15 @@ topology_template:
       link_ps_server_1b_port:
       - abstract_ps_server_1b
       - link_ps_server_1b_ps_server_1b_port
+      dependency_oam_server_1c2_2_mgmt_port_0:
+      - abstract_oam_server_1c2_1
+      - dependency_oam_server_1c2_oam_server_1c2_mgmt_port_0
       local_storage_server_1b_pd:
       - abstract_pd_server_1b
       - local_storage_pd_server_1b
+      dependency_oam_server_1c2_1_mgmt_port_0:
+      - abstract_oam_server_1c2_0
+      - dependency_oam_server_1c2_oam_server_1c2_mgmt_port_0
       dependency_ps_server_1b_port:
       - abstract_ps_server_1b
       - dependency_ps_server_1b_ps_server_1b_port
@@ -1408,9 +1408,9 @@ topology_template:
       dependency_pd_server_1b_port:
       - abstract_pd_server_1b
       - dependency_pd_server_1b_pd_server_1b_port
-      dependency_cmaui_port_1:
+      dependency_cmaui_1c1_1_mgmt_port_0:
       - abstract_cmaui_1c1
-      - dependency_cmaui_1c1_cmaui_port
+      - dependency_cmaui_1c1_cmaui_1c1_mgmt_port_0
       dependency_packet_internal_network:
       - packet_internal_network
       - dependency
@@ -1420,9 +1420,9 @@ topology_template:
       local_storage_server_1c1_cmaui_1:
       - abstract_cmaui_1c1
       - local_storage_cmaui_1c1
-      dependency_cmaui_port_2:
+      dependency_cmaui_1c1_2_mgmt_port_0:
       - abstract_cmaui_1c1
-      - dependency_cmaui_1c1_cmaui_port
+      - dependency_cmaui_1c1_cmaui_1c1_mgmt_port_0
       dependency_packet_external_network:
       - packet_external_network
-      - dependency
\ No newline at end of file
+      - dependency