duplicate ids

throw an exception when a zip with duplicate ids in different files is getting uploaded

Issue - Id : SDC-554

Change-Id: I213233d8833b89788f980db859d9597d2c1cb950
Signed-off-by: talio <tali.orenbach@amdocs.com>

28 files changed, 4976 insertions, 4976 deletions

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/nestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/nestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
index b2eb38f367..e73e81a437 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/nestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/nestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -69,14 +69,14 @@ node_types:
         occurrences:
         - 1
         - 1
-    - dependency_server_cmaui:
+    - dependency_server_cmaui_1:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - local_storage_server_cmaui:
+    - local_storage_server_cmaui_1:
         capability: tosca.capabilities.Attachment
         node: tosca.nodes.BlockStorage
         relationship: tosca.relationships.AttachesTo
@@ -103,6 +103,20 @@ node_types:
         occurrences:
         - 1
         - 1
+    - dependency_server_cmaui_2_test_nested2Level:
+        capability: tosca.capabilities.Node
+        node: tosca.nodes.Root
+        relationship: tosca.relationships.DependsOn
+        occurrences:
+        - 0
+        - UNBOUNDED
+    - local_storage_server_cmaui_2_test_nested2Level:
+        capability: tosca.capabilities.Attachment
+        node: tosca.nodes.BlockStorage
+        relationship: tosca.relationships.AttachesTo
+        occurrences:
+        - 0
+        - UNBOUNDED
     - dependency_cmaui_port_4_test_nested2Level:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
@@ -143,6 +157,20 @@ node_types:
         occurrences:
         - 1
         - 1
+    - dependency_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+        capability: tosca.capabilities.Node
+        node: tosca.nodes.Root
+        relationship: tosca.relationships.DependsOn
+        occurrences:
+        - 0
+        - UNBOUNDED
+    - local_storage_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+        capability: tosca.capabilities.Attachment
+        node: tosca.nodes.BlockStorage
+        relationship: tosca.relationships.AttachesTo
+        occurrences:
+        - 0
+        - UNBOUNDED
     - dependency_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
@@ -156,14 +184,14 @@ node_types:
         occurrences:
         - 1
         - 1
-    - dependency_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+    - dependency_server_cmaui_3_test_nested3Level_test_nested2Level:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - local_storage_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+    - local_storage_server_cmaui_3_test_nested3Level_test_nested2Level:
         capability: tosca.capabilities.Attachment
         node: tosca.nodes.BlockStorage
         relationship: tosca.relationships.AttachesTo
@@ -196,34 +224,6 @@ node_types:
         occurrences:
         - 1
         - 1
-    - dependency_server_cmaui_test_nested3Level_test_nested2Level:
-        capability: tosca.capabilities.Node
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.DependsOn
-        occurrences:
-        - 0
-        - UNBOUNDED
-    - local_storage_server_cmaui_test_nested3Level_test_nested2Level:
-        capability: tosca.capabilities.Attachment
-        node: tosca.nodes.BlockStorage
-        relationship: tosca.relationships.AttachesTo
-        occurrences:
-        - 0
-        - UNBOUNDED
-    - dependency_server_cmaui_test_nested2Level:
-        capability: tosca.capabilities.Node
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.DependsOn
-        occurrences:
-        - 0
-        - UNBOUNDED
-    - local_storage_server_cmaui_test_nested2Level:
-        capability: tosca.capabilities.Attachment
-        node: tosca.nodes.BlockStorage
-        relationship: tosca.relationships.AttachesTo
-        occurrences:
-        - 0
-        - UNBOUNDED
     - dependency_cmaui_port_1:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
@@ -238,24 +238,7 @@ node_types:
         - 1
         - 1
     capabilities:
-      os_server_cmaui_test_nested2Level:
-        type: tosca.capabilities.OperatingSystem
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.device.write.requests.rate_server_cmaui:
-        type: org.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_cmaui:
-        type: org.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_cmaui_test_nested3Level_test_nested2Level:
+      memory.resident_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -274,39 +257,38 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-      disk.ephemeral.size_server_cmaui_test_nested3Level_test_nested2Level:
+      memory.resident_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.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.usage_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.device.latency_server_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
-      host_server_cmaui:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
+      disk.device.latency_server_cmaui_3_test_nested3Level_test_nested2Level:
+        type: org.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_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.device.read.requests_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.root.size_server_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
-      feature_server_cmaui_test_nested2Level:
-        type: tosca.capabilities.Node
+      scalable_server_cmaui_3_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
@@ -316,8 +298,9 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      endpoint_server_cmaui_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.Endpoint.Admin
+      disk.read.requests_server_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
@@ -334,73 +317,89 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-      disk.device.write.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      endpoint_server_cmaui_2_test_nested2Level:
+        type: tosca.capabilities.Endpoint.Admin
+        occurrences:
+        - 1
+        - UNBOUNDED
+      binding_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.network.Bindable
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.latency_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.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_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      network.incoming.packets_cmaui_port_3_test_nested2Level:
         type: org.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_cmaui_port_3_test_nested2Level:
+      binding_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
+      disk.device.read.bytes.rate_server_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
-      feature_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      feature_server_cmaui_2_test_nested2Level:
         type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.root.size_server_cmaui_test_nested2Level:
+      disk.read.bytes_server_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
-      disk.write.requests_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.capacity_server_cmaui_2_test_nested2Level:
         type: org.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_8_test_nested4Level_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+      disk.write.bytes_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
-        - 0
+        - 1
         - UNBOUNDED
-      disk.root.size_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.device.read.bytes_server_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
-      disk.usage_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.device.write.requests_server_cmaui_2_test_nested2Level:
         type: org.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_cmaui:
+      disk.write.requests.rate_server_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
-      cpu.delta_server_cmaui_test_nested3Level_test_nested2Level:
+      network.incoming.packets.rate_cmaui_port_6_test_nested3Level_test_nested2Level:
         type: org.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_6_test_nested3Level_test_nested2Level:
+      disk.device.read.bytes_server_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -418,7 +417,19 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_server_cmaui_test_nested2Level:
+      cpu_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.write.requests.rate_server_cmaui_2_test_nested2Level:
+        type: org.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_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -441,12 +452,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      os_server_cmaui:
-        type: tosca.capabilities.OperatingSystem
-        occurrences:
-        - 1
-        - UNBOUNDED
-      memory.resident_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.read.bytes_server_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -459,52 +465,37 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-      os_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.OperatingSystem
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.device.read.requests.rate_server_cmaui_test_nested3Level_test_nested2Level:
+      network.incoming.bytes.rate_cmaui_port_4_test_nested2Level:
         type: org.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_cmaui_port_4_test_nested2Level:
+      network.incoming.bytes_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.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_cmaui_test_nested2Level:
+      disk.device.allocation_server_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      scalable_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.Scalable
-        occurrences:
-        - 1
-        - UNBOUNDED
-      instance_server_cmaui_test_nested2Level:
+      disk.ephemeral.size_server_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_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.device.read.bytes_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      endpoint_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.Endpoint.Admin
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.ephemeral.size_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.device.capacity_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -522,35 +513,24 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.allocation_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.read.bytes.rate_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.device.read.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.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_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.read.bytes_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.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_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      instance_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.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_cmaui:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
       binding_cmaui_port_1:
         type: tosca.capabilities.network.Bindable
         valid_source_types:
@@ -565,58 +545,48 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-      binding_server_cmaui_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.network.Bindable
-        occurrences:
-        - 1
-        - UNBOUNDED
       feature_test_nested2Level:
         type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      memory.usage_server_cmaui:
+      disk.write.requests_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.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_cmaui:
+      disk.device.write.requests_server_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
-      os_server_cmaui_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.OperatingSystem
-        occurrences:
-        - 1
-        - UNBOUNDED
-      network.incoming.packets_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
+      cpu_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.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_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.read.requests_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.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_cmaui_test_nested3Level_test_nested2Level:
+      network.incoming.packets_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.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_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.device.write.bytes.rate_server_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
-      disk.device.iops_server_cmaui:
+      cpu_util_server_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:
@@ -634,49 +604,49 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.iops_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      network.incoming.bytes_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.incoming.bytes_cmaui_port_1:
+      network.incoming.bytes_cmaui_port_5_test_nested3Level_test_nested2Level:
         type: org.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_5_test_nested3Level_test_nested2Level:
+      disk.write.bytes.rate_server_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.rate_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.device.write.bytes_server_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
-      disk.device.read.requests_server_cmaui_test_nested2Level:
+      disk.device.read.requests.rate_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.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:
+      network.outgoing.bytes.rate_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.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_2:
+      network.incoming.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
-      cpu_server_cmaui:
+      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:
@@ -698,274 +668,252 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes.rate_server_cmaui:
+      cpu_server_cmaui_2_test_nested2Level:
         type: org.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_cmaui_test_nested2Level:
+      disk.ephemeral.size_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.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_cmaui_test_nested2Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      binding_server_cmaui_1:
+        type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.latency_server_cmaui:
+      disk.root.size_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.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_cmaui:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      os_server_cmaui_3_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      disk.usage_server_cmaui:
+      disk.device.read.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.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.usage_server_cmaui:
+      cpu_util_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.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_server_cmaui:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      scalable_server_cmaui_1:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests.rate_server_cmaui:
+      disk.write.bytes_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.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_7_test_nested4Level_test_nested3Level_test_nested2Level:
+      memory_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.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_server_cmaui_test_nested2Level:
+      disk.device.write.bytes_server_cmaui_2_test_nested2Level:
         type: org.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_8_test_nested4Level_test_nested3Level_test_nested2Level:
+      network.incoming.packets.rate_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.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_server_cmaui:
+      network.outpoing.packets_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.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_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-        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_cmaui_1:
+        type: tosca.capabilities.Endpoint.Admin
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.iops_server_cmaui_test_nested3Level_test_nested2Level:
+      network.incoming.bytes.rate_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.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_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      os_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests.rate_server_cmaui_test_nested2Level:
+      disk.usage_server_cmaui_2_test_nested2Level:
         type: org.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_server_cmaui:
-        type: tosca.capabilities.network.Bindable
-        occurrences:
-        - 1
-        - UNBOUNDED
       network.outgoing.packets.rate_cmaui_port_4_test_nested2Level:
         type: org.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_cmaui:
+      disk.device.read.requests.rate_server_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      vcpus_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.read.bytes.rate_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.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_8_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.device.iops_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.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_7_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.device.allocation_server_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
-      disk.device.capacity_server_cmaui_test_nested3Level_test_nested2Level:
+      network.incoming.packets.rate_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.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_cmaui:
+      network.outpoing.packets_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      endpoint_server_cmaui_test_nested2Level:
-        type: tosca.capabilities.Endpoint.Admin
-        occurrences:
-        - 1
-        - UNBOUNDED
-      network.incoming.packets_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
+      memory_server_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
-      disk.write.bytes.rate_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.device.write.bytes_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.write.requests.rate_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.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_5_test_nested3Level_test_nested2Level:
+      network.incoming.packets_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.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_cmaui_test_nested3Level_test_nested2Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      os_server_cmaui_2_test_nested2Level:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes.rate_server_cmaui_test_nested2Level:
+      network.outgoing.bytes_cmaui_port_5_test_nested3Level_test_nested2Level:
         type: org.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_4_test_nested2Level:
+      disk.read.requests_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.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_3_test_nested2Level:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      network.outpoing.packets_cmaui_port_5_test_nested3Level_test_nested2Level:
+      vcpus_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.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_cmaui_test_nested3Level_test_nested2Level:
+      disk.device.capacity_server_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
-      memory.usage_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.device.iops_server_cmaui_2_test_nested2Level:
         type: org.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_3_test_nested2Level:
-        type: tosca.capabilities.Attachment
+      network.incoming.bytes_cmaui_port_4_test_nested2Level:
+        type: org.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_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.network.Bindable
+      feature_cmaui_port_3_test_nested2Level:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      vcpus_server_cmaui:
+      disk.read.bytes.rate_server_cmaui_2_test_nested2Level:
         type: org.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_server_cmaui:
+      network.outpoing.packets_cmaui_port_5_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes_server_cmaui_test_nested3Level_test_nested2Level:
+      instance_server_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
-      instance_server_cmaui_test_nested3Level_test_nested2Level:
+      instance_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.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_server_cmaui_test_nested2Level:
+      memory_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.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_cmaui:
-        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_port_3_test_nested2Level:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-        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_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.Endpoint.Admin
         occurrences:
         - 1
         - UNBOUNDED
@@ -981,59 +929,42 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.ephemeral.size_server_cmaui_test_nested2Level:
+      disk.device.read.requests_server_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
-      disk.device.read.bytes_server_cmaui_test_nested3Level_test_nested2Level:
+      cpu.delta_server_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
-      disk.device.allocation_server_cmaui_test_nested2Level:
-        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_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.iops_server_cmaui_test_nested2Level:
+      disk.device.read.bytes_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.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_server_cmaui_test_nested2Level:
-        type: tosca.capabilities.network.Bindable
-        occurrences:
-        - 1
-        - UNBOUNDED
       network.outgoing.bytes_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.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_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-        type: org.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_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.write.bytes.rate_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.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_cmaui:
+      disk.device.allocation_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -1044,7 +975,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.capacity_server_cmaui_test_nested2Level:
+      cpu_util_server_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -1055,47 +986,42 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests_server_cmaui_test_nested2Level:
+      memory.usage_server_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      scalable_server_cmaui:
-        type: tosca.capabilities.Scalable
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.read.bytes.rate_server_cmaui:
+      disk.device.usage_server_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
-      disk.device.usage_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.write.requests_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      scalable_server_cmaui_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.Scalable
+      feature_server_cmaui_3_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes_server_cmaui_test_nested2Level:
+      disk.device.read.requests_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.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_cmaui_test_nested3Level_test_nested2Level:
+      disk.root.size_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.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_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.device.write.requests.rate_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -1107,127 +1033,120 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.usage_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.device.write.requests.rate_server_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
-      cpu_util_server_cmaui:
+      disk.read.requests_server_cmaui_2_test_nested2Level:
         type: org.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_cmaui:
-        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_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests.rate_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.device.write.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.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_server_cmaui_test_nested2Level:
+      disk.write.bytes.rate_server_cmaui_2_test_nested2Level:
         type: org.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_cmaui_test_nested2Level:
+      disk.latency_server_cmaui_2_test_nested2Level:
         type: org.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_4_test_nested2Level:
+      vcpus_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.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.usage_server_cmaui_test_nested2Level:
+      disk.device.iops_server_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
-      disk.read.requests_server_cmaui_test_nested3Level_test_nested2Level:
+      network.outgoing.bytes_cmaui_port_4_test_nested2Level:
         type: org.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_cmaui:
+      disk.device.write.bytes_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.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_cmaui_port_5_test_nested3Level_test_nested2Level:
+      disk.device.usage_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.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_cmaui_test_nested3Level_test_nested2Level:
-        type: org.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_cmaui:
+      network.incoming.packets_cmaui_port_5_test_nested3Level_test_nested2Level:
         type: org.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_cmaui_test_nested3Level_test_nested2Level:
+      disk.capacity_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests.rate_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.device.write.bytes.rate_server_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      vcpus_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.device.read.requests_server_cmaui_2_test_nested2Level:
         type: org.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_server_cmaui_test_nested3Level_test_nested2Level:
+      cpu_server_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
-      disk.device.write.requests.rate_server_cmaui_test_nested2Level:
+      memory.resident_server_cmaui_2_test_nested2Level:
         type: org.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_cmaui_port_2:
+      disk.device.iops_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.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_cmaui:
+      disk.allocation_server_cmaui_2_test_nested2Level:
         type: org.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_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      network.incoming.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:
@@ -1245,62 +1164,60 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes_server_cmaui_test_nested2Level:
+      memory.usage_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests.rate_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.device.write.requests_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.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_cmaui_test_nested2Level:
+      disk.write.requests_server_cmaui_2_test_nested2Level:
         type: org.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_8_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.capacity_server_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.outpoing.packets_cmaui_port_3_test_nested2Level:
+      disk.read.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests.rate_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.write.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.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_server_cmaui_test_nested3Level_test_nested2Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      scalable_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
-      host_server_cmaui_test_nested2Level:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
+      network.outgoing.packets.rate_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: org.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_cmaui_port_6_test_nested3Level_test_nested2Level:
+      network.outpoing.packets_cmaui_port_3_test_nested2Level:
         type: org.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_server_cmaui_test_nested3Level_test_nested2Level:
+      network.incoming.packets_cmaui_port_6_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -1313,36 +1230,36 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-      disk.device.read.bytes.rate_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.allocation_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.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_4_test_nested2Level:
+      disk.device.read.bytes.rate_server_cmaui_2_test_nested2Level:
         type: org.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_test_nested4Level_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.Node
+      network.incoming.packets.rate_cmaui_port_4_test_nested2Level:
+        type: org.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_cmaui_test_nested2Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.iops_server_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
-      vcpus_server_cmaui_test_nested2Level:
+      disk.device.usage_server_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -1353,19 +1270,19 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes.rate_server_cmaui_test_nested3Level_test_nested2Level:
+      cpu.delta_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.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_port_2:
+      disk.device.write.bytes.rate_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.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_cmaui_test_nested2Level:
+      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:
@@ -1382,142 +1299,140 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      memory.usage_server_cmaui_test_nested2Level:
+      network.outgoing.packets.rate_cmaui_port_5_test_nested3Level_test_nested2Level:
         type: org.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_cmaui:
+      network.outgoing.bytes.rate_cmaui_port_4_test_nested2Level:
         type: org.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_5_test_nested3Level_test_nested2Level:
-        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_cmaui_3_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.Endpoint.Admin
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_cmaui_port_4_test_nested2Level:
+      binding_server_cmaui_3_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.network.Bindable
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.ephemeral.size_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes_server_cmaui:
+      disk.iops_server_cmaui_2_test_nested2Level:
         type: org.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_cmaui_test_nested2Level:
+      disk.write.bytes_server_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
-      feature_server_cmaui_test_nested3Level_test_nested2Level:
+      feature_server_cmaui_1:
         type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      memory_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.allocation_server_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
-      cpu_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.iops_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.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_server_cmaui:
+      network.outgoing.bytes_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.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_cmaui_test_nested3Level_test_nested2Level:
-        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_port_2:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      instance_server_cmaui_2_test_nested2Level:
         type: org.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_8_test_nested4Level_test_nested3Level_test_nested2Level:
+      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
-      disk.device.read.requests.rate_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      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_2:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.device.capacity_server_cmaui:
+      network.incoming.packets.rate_cmaui_port_3_test_nested2Level:
         type: org.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_1:
+      disk.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.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.
+      attachment_cmaui_port_1:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_cmaui_port_3_test_nested2Level:
+      network.outgoing.packets.rate_cmaui_port_3_test_nested2Level:
         type: org.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
+      network.outgoing.bytes.rate_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: org.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_server_cmaui_test_nested2Level:
+      disk.write.requests_server_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.packets.rate_cmaui_port_3_test_nested2Level:
+      disk.read.bytes_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.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_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
+      cpu.delta_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.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_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.usage_server_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:
@@ -1529,30 +1444,36 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      memory_server_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.usage_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.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_server_cmaui:
+      disk.device.allocation_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      scalable_server_cmaui_test_nested2Level:
-        type: tosca.capabilities.Scalable
+      os_server_cmaui_1:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      disk.usage_server_cmaui_test_nested2Level:
+      disk.device.latency_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: org.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_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -1574,19 +1495,31 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.capacity_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      cpu_util_server_cmaui_3_test_nested3Level_test_nested2Level:
+        type: org.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_cmaui_2_test_nested2Level:
+        type: org.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_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.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_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.ephemeral.size_server_cmaui_2_test_nested2Level:
         type: org.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_cmaui_test_nested2Level:
+      disk.usage_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -1598,25 +1531,42 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      host_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      host_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: tosca.capabilities.Container
         valid_source_types:
         - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
-      feature_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.Node
+      disk.capacity_server_cmaui_3_test_nested3Level_test_nested2Level:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      host_server_cmaui_test_nested3Level_test_nested2Level:
+      host_server_cmaui_1:
         type: tosca.capabilities.Container
         valid_source_types:
         - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
+      feature_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      binding_server_cmaui_2_test_nested2Level:
+        type: tosca.capabilities.network.Bindable
+        occurrences:
+        - 1
+        - UNBOUNDED
+      cpu.delta_server_cmaui_2_test_nested2Level:
+        type: org.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_4_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -1630,37 +1580,49 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-      disk.device.write.requests_server_cmaui_test_nested2Level:
+      disk.device.capacity_server_cmaui_2_test_nested2Level:
         type: org.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_cmaui:
+      disk.device.write.requests_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes.rate_server_cmaui_test_nested2Level:
+      memory.usage_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.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_cmaui:
+      scalable_server_cmaui_2_test_nested2Level:
+        type: tosca.capabilities.Scalable
+        occurrences:
+        - 1
+        - UNBOUNDED
+      host_server_cmaui_3_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.iops_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.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_cmaui_test_nested2Level:
+      vcpus_server_cmaui_2_test_nested2Level:
         type: org.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_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.device.read.requests.rate_server_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:
@@ -1684,13 +1646,25 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests_server_cmaui:
+      disk.device.read.bytes.rate_server_cmaui_3_test_nested3Level_test_nested2Level:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      vcpus_server_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
-      cpu.delta_server_cmaui_test_nested2Level:
+      disk.write.requests.rate_server_cmaui_2_test_nested2Level:
+        type: org.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_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -1706,13 +1680,25 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      disk.device.usage_server_cmaui_3_test_nested3Level_test_nested2Level:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.read.bytes.rate_server_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.rate_cmaui_port_3_test_nested2Level:
         type: org.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_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.device.capacity_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -1724,18 +1710,32 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      endpoint_server_cmaui:
-        type: tosca.capabilities.Endpoint.Admin
+      memory.resident_server_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
+      disk.device.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: org.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_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.latency_server_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
-      disk.allocation_server_cmaui_test_nested3Level_test_nested2Level:
+      host_server_cmaui_2_test_nested2Level:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
+        occurrences:
+        - 1
+        - UNBOUNDED
+      memory.usage_server_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:
@@ -1805,6 +1805,20 @@ node_types:
         occurrences:
         - 1
         - 1
+    - dependency_server_cmaui_2:
+        capability: tosca.capabilities.Node
+        node: tosca.nodes.Root
+        relationship: tosca.relationships.DependsOn
+        occurrences:
+        - 0
+        - UNBOUNDED
+    - local_storage_server_cmaui_2:
+        capability: tosca.capabilities.Attachment
+        node: tosca.nodes.BlockStorage
+        relationship: tosca.relationships.AttachesTo
+        occurrences:
+        - 0
+        - UNBOUNDED
     - dependency_cmaui_port_4:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
@@ -1845,6 +1859,20 @@ node_types:
         occurrences:
         - 1
         - 1
+    - dependency_server_cmaui_4_test_nested4Level_test_nested3Level:
+        capability: tosca.capabilities.Node
+        node: tosca.nodes.Root
+        relationship: tosca.relationships.DependsOn
+        occurrences:
+        - 0
+        - UNBOUNDED
+    - local_storage_server_cmaui_4_test_nested4Level_test_nested3Level:
+        capability: tosca.capabilities.Attachment
+        node: tosca.nodes.BlockStorage
+        relationship: tosca.relationships.AttachesTo
+        occurrences:
+        - 0
+        - UNBOUNDED
     - dependency_cmaui_port_8_test_nested4Level_test_nested3Level:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
@@ -1858,14 +1886,14 @@ node_types:
         occurrences:
         - 1
         - 1
-    - dependency_server_cmaui_test_nested4Level_test_nested3Level:
+    - dependency_server_cmaui_3_test_nested3Level:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - local_storage_server_cmaui_test_nested4Level_test_nested3Level:
+    - local_storage_server_cmaui_3_test_nested3Level:
         capability: tosca.capabilities.Attachment
         node: tosca.nodes.BlockStorage
         relationship: tosca.relationships.AttachesTo
@@ -1898,161 +1926,109 @@ node_types:
         occurrences:
         - 1
         - 1
-    - dependency_server_cmaui_test_nested3Level:
-        capability: tosca.capabilities.Node
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.DependsOn
-        occurrences:
-        - 0
-        - UNBOUNDED
-    - local_storage_server_cmaui_test_nested3Level:
-        capability: tosca.capabilities.Attachment
-        node: tosca.nodes.BlockStorage
-        relationship: tosca.relationships.AttachesTo
-        occurrences:
-        - 0
-        - UNBOUNDED
-    - dependency_server_cmaui:
-        capability: tosca.capabilities.Node
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.DependsOn
-        occurrences:
-        - 0
-        - UNBOUNDED
-    - local_storage_server_cmaui:
-        capability: tosca.capabilities.Attachment
-        node: tosca.nodes.BlockStorage
-        relationship: tosca.relationships.AttachesTo
-        occurrences:
-        - 0
-        - UNBOUNDED
     capabilities:
-      cpu.delta_server_cmaui:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.device.write.requests.rate_server_cmaui:
+      instance_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.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_server_cmaui_test_nested4Level_test_nested3Level:
+      memory.usage_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      vcpus_server_cmaui_test_nested3Level:
+      cpu_util_server_cmaui_3_test_nested3Level:
         type: org.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_cmaui:
+      disk.device.usage_server_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.latency_server_cmaui_test_nested3Level:
+      disk.device.usage_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.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_cmaui_test_nested4Level_test_nested3Level:
+      disk.device.latency_server_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
-      scalable_server_cmaui:
-        type: tosca.capabilities.Scalable
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.read.bytes.rate_server_cmaui:
+      network.incoming.bytes_cmaui_port_7_test_nested4Level_test_nested3Level:
         type: org.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_cmaui_test_nested4Level_test_nested3Level:
+      disk.usage_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.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_7_test_nested4Level_test_nested3Level:
+      disk.root.size_server_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.capacity_server_cmaui_test_nested4Level_test_nested3Level:
+      disk.device.write.requests.rate_server_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
-      host_server_cmaui:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
-        occurrences:
-        - 1
-        - UNBOUNDED
-      cpu_util_server_cmaui:
+      disk.read.requests_server_cmaui_3_test_nested3Level:
         type: org.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_cmaui_test_nested3Level:
-        type: tosca.capabilities.OperatingSystem
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.device.read.bytes_server_cmaui_test_nested4Level_test_nested3Level:
+      disk.latency_server_cmaui_3_test_nested3Level:
         type: org.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_server_cmaui_test_nested4Level_test_nested3Level:
+      disk.write.bytes.rate_server_cmaui_3_test_nested3Level:
         type: org.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_cmaui_test_nested4Level_test_nested3Level:
+      network.outgoing.bytes_cmaui_port_3:
         type: org.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_3:
-        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_cmaui_4_test_nested4Level_test_nested3Level:
+        type: tosca.capabilities.Endpoint.Admin
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests_server_cmaui:
+      disk.read.requests_server_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
-      instance_server_cmaui_test_nested4Level_test_nested3Level:
+      cpu_util_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.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_cmaui_test_nested3Level:
+      disk.write.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -2063,26 +2039,27 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes_server_cmaui_test_nested3Level:
+      network.outgoing.bytes.rate_cmaui_port_8_test_nested4Level_test_nested3Level:
         type: org.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_cmaui_test_nested4Level_test_nested3Level:
+      disk.device.iops_server_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.outgoing.bytes.rate_cmaui_port_8_test_nested4Level_test_nested3Level:
+      disk.device.write.bytes_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.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_cmaui_test_nested3Level:
-        type: tosca.capabilities.Node
+      disk.device.capacity_server_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
@@ -2091,191 +2068,191 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      memory.usage_server_cmaui_test_nested3Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      host_server_cmaui_4_test_nested4Level_test_nested3Level:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
-      instance_server_cmaui:
+      disk.device.read.bytes.rate_server_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.read.bytes_server_cmaui:
+      disk.ephemeral.size_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.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_server_cmaui_test_nested3Level:
-        type: tosca.capabilities.network.Bindable
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.root.size_server_cmaui:
+      disk.read.bytes_server_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
-      memory_server_cmaui_test_nested3Level:
+      disk.device.read.bytes_server_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.outgoing.bytes.rate_cmaui_port_5_test_nested3Level:
+      disk.device.capacity_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.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_cmaui_port_3:
+      disk.root.size_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.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_cmaui:
-        type: tosca.capabilities.OperatingSystem
+      disk.write.requests.rate_server_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_cmaui:
+      disk.iops_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.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_cmaui_port_4:
+      network.outgoing.bytes.rate_cmaui_port_5_test_nested3Level:
         type: org.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_cmaui_test_nested4Level_test_nested3Level:
+      memory_server_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.outgoing.bytes_cmaui_port_6_test_nested3Level:
+      cpu_server_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.outgoing.bytes_cmaui_port_7_test_nested4Level_test_nested3Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      host_server_cmaui_3_test_nested3Level:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
-      disk.ephemeral.size_server_cmaui_test_nested3Level:
+      network.incoming.packets_cmaui_port_3:
         type: org.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_6_test_nested3Level:
+      disk.allocation_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests.rate_server_cmaui_test_nested4Level_test_nested3Level:
+      memory_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.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_5_test_nested3Level:
+      network.incoming.packets_cmaui_port_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      vcpus_server_cmaui_test_nested4Level_test_nested3Level:
+      network.outgoing.bytes_cmaui_port_6_test_nested3Level:
         type: org.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_cmaui_port_6_test_nested3Level:
+      network.outgoing.bytes_cmaui_port_7_test_nested4Level_test_nested3Level:
         type: org.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_cmaui_test_nested3Level:
+      network.incoming.packets.rate_cmaui_port_6_test_nested3Level:
         type: org.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_8_test_nested4Level_test_nested3Level:
+      disk.ephemeral.size_server_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
-      endpoint_server_cmaui_test_nested4Level_test_nested3Level:
-        type: tosca.capabilities.Endpoint.Admin
+      cpu.delta_server_cmaui_4_test_nested4Level_test_nested3Level:
+        type: org.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_port_6_test_nested3Level:
+      disk.write.requests_server_cmaui_3_test_nested3Level:
         type: org.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_cmaui_test_nested3Level:
+      network.outpoing.packets_cmaui_port_5_test_nested3Level:
         type: org.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_cmaui_test_nested3Level:
+      disk.capacity_server_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.ephemeral.size_server_cmaui_test_nested4Level_test_nested3Level:
+      network.incoming.packets_cmaui_port_6_test_nested3Level:
         type: org.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_cmaui_test_nested3Level:
+      network.incoming.bytes_cmaui_port_8_test_nested4Level_test_nested3Level:
         type: org.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_cmaui_test_nested3Level:
+      network.outgoing.bytes.rate_cmaui_port_6_test_nested3Level:
         type: org.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_server_cmaui_test_nested3Level:
+      disk.read.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests_server_cmaui_test_nested4Level_test_nested3Level:
+      disk.read.bytes.rate_server_cmaui_3_test_nested3Level:
         type: org.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_cmaui:
-        type: tosca.capabilities.Node
+      disk.device.iops_server_cmaui_4_test_nested4Level_test_nested3Level:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
@@ -2286,7 +2263,7 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-      disk.device.read.bytes.rate_server_cmaui_test_nested3Level:
+      disk.iops_server_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:
@@ -2299,24 +2276,7 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-      disk.device.write.requests_server_cmaui_test_nested4Level_test_nested3Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
-      endpoint_server_cmaui_test_nested3Level:
-        type: tosca.capabilities.Endpoint.Admin
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.device.write.requests_server_cmaui_test_nested3Level:
-        type: org.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_cmaui:
+      disk.device.write.requests_server_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:
@@ -2332,7 +2292,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.ephemeral.size_server_cmaui:
+      memory_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -2344,19 +2304,24 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      memory_server_cmaui_test_nested4Level_test_nested3Level:
+      feature_server_cmaui_3_test_nested3Level:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.outgoing.bytes.rate_cmaui_port_3:
         type: org.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_port_3:
+      disk.device.write.bytes.rate_server_cmaui_3_test_nested3Level:
         type: org.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.usage_server_cmaui_test_nested3Level:
+      disk.root.size_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -2375,19 +2340,24 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-      disk.iops_server_cmaui:
+      disk.usage_server_cmaui_3_test_nested3Level:
         type: org.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_4:
+      os_server_cmaui_4_test_nested4Level_test_nested3Level:
+        type: tosca.capabilities.OperatingSystem
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.write.requests_server_cmaui_3_test_nested3Level:
         type: org.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_cmaui_test_nested4Level_test_nested3Level:
+      network.incoming.bytes_cmaui_port_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -2399,194 +2369,208 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.iops_server_cmaui:
+      disk.device.read.requests.rate_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes_server_cmaui:
+      disk.device.latency_server_cmaui_3_test_nested3Level:
         type: org.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_cmaui_test_nested3Level:
+      cpu_util_server_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.outgoing.bytes_cmaui_port_8_test_nested4Level_test_nested3Level:
+      memory.usage_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.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_8_test_nested4Level_test_nested3Level:
+      disk.device.write.requests.rate_server_cmaui_3_test_nested3Level:
         type: org.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_cmaui_test_nested4Level_test_nested3Level:
+      network.outgoing.bytes_cmaui_port_8_test_nested4Level_test_nested3Level:
         type: org.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_7_test_nested4Level_test_nested3Level:
-        type: tosca.capabilities.Node
+      disk.device.write.bytes.rate_server_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
-      cpu_server_cmaui:
+      disk.write.bytes.rate_server_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.packets.rate_cmaui_port_3:
+      disk.device.read.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.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_3:
-        type: tosca.capabilities.Node
+      vcpus_server_cmaui_4_test_nested4Level_test_nested3Level:
+        type: org.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_4:
+      network.outpoing.packets_cmaui_port_8_test_nested4Level_test_nested3Level:
         type: org.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_4:
-        type: tosca.capabilities.Node
+      disk.device.write.bytes_server_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
-      attachment_cmaui_port_6_test_nested3Level:
-        type: tosca.capabilities.Attachment
+      feature_cmaui_port_7_test_nested4Level_test_nested3Level:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes.rate_server_cmaui:
+      disk.iops_server_cmaui_3_test_nested3Level:
         type: org.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_server_cmaui_test_nested4Level_test_nested3Level:
+      network.incoming.packets.rate_cmaui_port_3:
         type: org.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_6_test_nested3Level:
+      cpu_server_cmaui_3_test_nested3Level:
         type: org.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_server_cmaui:
-        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_port_3:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_4:
+      disk.write.bytes_server_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.write.requests.rate_server_cmaui_test_nested3Level:
+      network.incoming.packets.rate_cmaui_port_4:
         type: org.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_3:
-        type: tosca.capabilities.Attachment
+      feature_server_cmaui_2:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes_server_cmaui_test_nested4Level_test_nested3Level:
-        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_port_4:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_cmaui_port_4:
+      attachment_cmaui_port_6_test_nested3Level:
         type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      disk.iops_server_cmaui_test_nested3Level:
+      network.outgoing.packets.rate_cmaui_port_6_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      host_server_cmaui_test_nested4Level_test_nested3Level:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
+      disk.allocation_server_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.latency_server_cmaui:
+      disk.device.allocation_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.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_cmaui:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      binding_server_cmaui_2:
+        type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.allocation_server_cmaui_test_nested3Level:
+      vcpus_server_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.read.requests_server_cmaui_test_nested4Level_test_nested3Level:
+      network.outgoing.packets.rate_cmaui_port_4:
         type: org.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_cmaui:
+      instance_server_cmaui_3_test_nested3Level:
         type: org.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_cmaui:
+      attachment_cmaui_port_3:
+        type: tosca.capabilities.Attachment
+        occurrences:
+        - 1
+        - UNBOUNDED
+      attachment_cmaui_port_4:
+        type: tosca.capabilities.Attachment
+        occurrences:
+        - 1
+        - UNBOUNDED
+      scalable_server_cmaui_2:
+        type: tosca.capabilities.Scalable
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.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_3:
+      disk.capacity_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.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.usage_server_cmaui:
+      network.outgoing.packets.rate_cmaui_port_3:
         type: org.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_cmaui_test_nested3Level:
+      disk.device.read.bytes.rate_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -2598,41 +2582,47 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.allocation_server_cmaui_test_nested4Level_test_nested3Level:
+      disk.write.requests_server_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.capacity_server_cmaui:
+      memory.resident_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests.rate_server_cmaui:
+      network.outpoing.packets_cmaui_port_7_test_nested4Level_test_nested3Level:
         type: org.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_cmaui_test_nested4Level_test_nested3Level:
-        type: tosca.capabilities.OperatingSystem
+      disk.usage_server_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.outpoing.packets_cmaui_port_7_test_nested4Level_test_nested3Level:
+      disk.device.usage_server_cmaui_3_test_nested3Level:
         type: org.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_cmaui_test_nested3Level:
+      disk.write.bytes_server_cmaui_3_test_nested3Level:
         type: org.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_cmaui_4_test_nested4Level_test_nested3Level:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.incoming.bytes.rate_cmaui_port_8_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -2646,39 +2636,42 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-      disk.root.size_server_cmaui_test_nested4Level_test_nested3Level:
+      disk.write.requests.rate_server_cmaui_3_test_nested3Level:
         type: org.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_server_cmaui:
+      disk.device.read.bytes_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
+      endpoint_server_cmaui_2:
+        type: tosca.capabilities.Endpoint.Admin
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.incoming.bytes_cmaui_port_6_test_nested3Level:
         type: org.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_server_cmaui:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      os_server_cmaui_2:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level:
+      disk.read.requests_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.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_cmaui_test_nested3Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      scalable_server_cmaui_4_test_nested4Level_test_nested3Level:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
@@ -2688,217 +2681,193 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      binding_server_cmaui:
-        type: tosca.capabilities.network.Bindable
+      attachment_cmaui_port_5_test_nested3Level:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.usage_server_cmaui_test_nested4Level_test_nested3Level:
+      disk.device.allocation_server_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.read.requests.rate_server_cmaui_test_nested4Level_test_nested3Level:
+      network.incoming.packets_cmaui_port_7_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests.rate_server_cmaui_test_nested4Level_test_nested3Level:
+      disk.device.latency_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.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_5_test_nested3Level:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.device.read.requests.rate_server_cmaui:
+      disk.read.bytes_server_cmaui_3_test_nested3Level:
         type: org.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_cmaui_test_nested4Level_test_nested3Level:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      binding_server_cmaui_test_nested4Level_test_nested3Level:
-        type: tosca.capabilities.network.Bindable
-        occurrences:
-        - 1
-        - UNBOUNDED
-      network.incoming.packets_cmaui_port_7_test_nested4Level_test_nested3Level:
+      disk.latency_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes_server_cmaui_test_nested4Level_test_nested3Level:
+      disk.device.allocation_server_cmaui_3_test_nested3Level:
         type: org.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_cmaui:
+      network.incoming.bytes.rate_cmaui_port_5_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      host_server_cmaui_test_nested3Level:
+      host_server_cmaui_2:
         type: tosca.capabilities.Container
         valid_source_types:
         - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
-      scalable_server_cmaui_test_nested4Level_test_nested3Level:
-        type: tosca.capabilities.Scalable
+      os_server_cmaui_3_test_nested3Level:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_cmaui_port_5_test_nested3Level:
+      disk.read.bytes_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.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_cmaui_port_8_test_nested4Level_test_nested3Level:
+      disk.write.requests_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.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_test_nested3Level:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.device.write.bytes_server_cmaui_test_nested3Level:
+      network.incoming.packets_cmaui_port_8_test_nested4Level_test_nested3Level:
         type: org.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_8_test_nested4Level_test_nested3Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      binding_server_cmaui_3_test_nested3Level:
+        type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_cmaui_port_8_test_nested4Level_test_nested3Level:
-        type: tosca.capabilities.Attachment
+      feature_test_nested3Level:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes.rate_server_cmaui_test_nested3Level:
+      network.outgoing.packets.rate_cmaui_port_8_test_nested4Level_test_nested3Level:
         type: org.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_cmaui_test_nested3Level:
+      cpu_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests.rate_server_cmaui_test_nested3Level:
+      cpu.delta_server_cmaui_3_test_nested3Level:
         type: org.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_server_cmaui_test_nested3Level:
+      disk.device.capacity_server_cmaui_3_test_nested3Level:
         type: org.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_cmaui_test_nested4Level_test_nested3Level:
+      disk.device.write.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.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_port_7_test_nested4Level_test_nested3Level:
-        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_port_8_test_nested4Level_test_nested3Level:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      memory.resident_server_cmaui:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      scalable_server_cmaui_3_test_nested3Level:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_cmaui_port_5_test_nested3Level:
+      instance_server_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.allocation_server_cmaui_test_nested4Level_test_nested3Level:
+      disk.device.iops_server_cmaui_3_test_nested3Level:
         type: org.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_7_test_nested4Level_test_nested3Level:
+      network.outgoing.bytes.rate_cmaui_port_7_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests_server_cmaui_test_nested3Level:
+      network.incoming.bytes_cmaui_port_5_test_nested3Level:
         type: org.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_cmaui:
-        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_cmaui_3_test_nested3Level:
+        type: tosca.capabilities.Endpoint.Admin
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_cmaui_port_6_test_nested3Level:
+      vcpus_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      vcpus_server_cmaui:
+      network.incoming.packets.rate_cmaui_port_7_test_nested4Level_test_nested3Level:
         type: org.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_4:
+      disk.allocation_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.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_7_test_nested4Level_test_nested3Level:
+      network.outpoing.packets_cmaui_port_6_test_nested3Level:
         type: org.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_server_cmaui:
+      network.outgoing.bytes_cmaui_port_4:
         type: org.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_cmaui_test_nested3Level:
+      network.outgoing.packets.rate_cmaui_port_7_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -2923,49 +2892,61 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      disk.device.write.bytes_server_cmaui_3_test_nested3Level:
+        type: org.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_5_test_nested3Level:
         type: org.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_cmaui_test_nested4Level_test_nested3Level:
+      disk.device.read.requests_server_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.allocation_server_cmaui:
+      disk.device.read.requests_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests_server_cmaui:
+      disk.read.bytes.rate_server_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
-      cpu_server_cmaui_test_nested3Level:
+      network.outpoing.packets_cmaui_port_3:
         type: org.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_cmaui_test_nested3Level:
+      disk.device.write.requests_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.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_cmaui_test_nested3Level:
+      disk.capacity_server_cmaui_3_test_nested3Level:
         type: org.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_3:
+      cpu.delta_server_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.read.requests.rate_server_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:
@@ -2977,12 +2958,29 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      binding_server_cmaui_4_test_nested4Level_test_nested3Level:
+        type: tosca.capabilities.network.Bindable
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.incoming.bytes.rate_cmaui_port_7_test_nested4Level_test_nested3Level:
         type: org.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_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.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
+        type: org.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_8_test_nested4Level_test_nested3Level:
         type: tosca.capabilities.network.Bindable
         valid_source_types:
@@ -2990,13 +2988,15 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-      scalable_server_cmaui_test_nested3Level:
-        type: tosca.capabilities.Scalable
+      disk.write.bytes_server_cmaui_4_test_nested4Level_test_nested3Level:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      endpoint_server_cmaui:
-        type: tosca.capabilities.Endpoint.Admin
+      disk.device.read.requests_server_cmaui_3_test_nested3Level:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
@@ -3005,49 +3005,49 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      cpu.delta_server_cmaui_test_nested4Level_test_nested3Level:
+      network.incoming.packets_cmaui_port_5_test_nested3Level:
         type: org.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_cmaui_port_5_test_nested3Level:
+      disk.latency_server_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.iops_server_cmaui_test_nested4Level_test_nested3Level:
+      disk.ephemeral.size_server_cmaui_3_test_nested3Level:
         type: org.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_server_cmaui_test_nested3Level:
+      network.outgoing.packets.rate_cmaui_port_5_test_nested3Level:
         type: org.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_cmaui_test_nested3Level:
+      disk.device.read.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.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_cmaui_test_nested4Level_test_nested3Level:
+      disk.device.read.bytes_server_cmaui_3_test_nested3Level:
         type: org.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_5_test_nested3Level:
+      memory.resident_server_cmaui_3_test_nested3Level:
         type: org.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_cmaui_test_nested4Level_test_nested3Level:
+      memory.usage_server_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:
@@ -3127,6 +3127,20 @@ node_types:
         occurrences:
         - 1
         - 1
+    - dependency_server_cmaui_4_test_nested4Level:
+        capability: tosca.capabilities.Node
+        node: tosca.nodes.Root
+        relationship: tosca.relationships.DependsOn
+        occurrences:
+        - 0
+        - UNBOUNDED
+    - local_storage_server_cmaui_4_test_nested4Level:
+        capability: tosca.capabilities.Attachment
+        node: tosca.nodes.BlockStorage
+        relationship: tosca.relationships.AttachesTo
+        occurrences:
+        - 0
+        - UNBOUNDED
     - dependency_cmaui_port_8_test_nested4Level:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
@@ -3140,14 +3154,14 @@ node_types:
         occurrences:
         - 1
         - 1
-    - dependency_server_cmaui_test_nested4Level:
+    - dependency_server_cmaui_3:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - local_storage_server_cmaui_test_nested4Level:
+    - local_storage_server_cmaui_3:
         capability: tosca.capabilities.Attachment
         node: tosca.nodes.BlockStorage
         relationship: tosca.relationships.AttachesTo
@@ -3180,245 +3194,251 @@ node_types:
         occurrences:
         - 1
         - 1
-    - dependency_server_cmaui:
-        capability: tosca.capabilities.Node
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.DependsOn
-        occurrences:
-        - 0
-        - UNBOUNDED
-    - local_storage_server_cmaui:
-        capability: tosca.capabilities.Attachment
-        node: tosca.nodes.BlockStorage
-        relationship: tosca.relationships.AttachesTo
+    capabilities:
+      memory.usage_server_cmaui_4_test_nested4Level:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
-        - 0
+        - 1
         - UNBOUNDED
-    capabilities:
-      cpu.delta_server_cmaui:
+      cpu_util_server_cmaui_4_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests.rate_server_cmaui:
+      disk.device.usage_server_cmaui_3:
         type: org.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_cmaui:
+      disk.device.latency_server_cmaui_3:
         type: org.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_server_cmaui_test_nested4Level:
+      disk.read.requests_server_cmaui_4_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      scalable_server_cmaui:
-        type: tosca.capabilities.Scalable
+      disk.root.size_server_cmaui_3:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes.rate_server_cmaui:
+      disk.device.write.requests.rate_server_cmaui_3:
         type: org.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_cmaui_test_nested4Level:
+      disk.write.bytes.rate_server_cmaui_4_test_nested4Level:
         type: org.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_cmaui_test_nested4Level:
+      disk.latency_server_cmaui_4_test_nested4Level:
         type: org.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_cmaui_test_nested4Level:
+      disk.read.requests_server_cmaui_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      host_server_cmaui:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
+      disk.device.iops_server_cmaui_3:
+        type: org.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_cmaui:
+      disk.device.capacity_server_cmaui_3:
         type: org.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_cmaui_test_nested4Level:
+      disk.device.read.bytes.rate_server_cmaui_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      vcpus_server_cmaui_test_nested4Level:
+      network.incoming.bytes.rate_cmaui_port_7_test_nested4Level:
         type: org.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.usage_server_cmaui_test_nested4Level:
+      feature_server_cmaui_4_test_nested4Level:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.capacity_server_cmaui_4_test_nested4Level:
         type: org.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_cmaui:
+      disk.read.bytes_server_cmaui_3:
         type: org.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_cmaui_port_7_test_nested4Level:
+      network.incoming.bytes.rate_cmaui_port_8_test_nested4Level:
         type: org.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_cmaui:
+      disk.device.write.bytes.rate_server_cmaui_4_test_nested4Level:
         type: org.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_cmaui_test_nested4Level:
+      disk.device.read.requests_server_cmaui_4_test_nested4Level:
         type: org.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_cmaui:
+      disk.device.write.requests_server_cmaui_4_test_nested4Level:
         type: org.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_cmaui_test_nested4Level:
+      disk.write.requests.rate_server_cmaui_3:
         type: org.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_cmaui_port_8_test_nested4Level:
+      disk.device.write.requests.rate_server_cmaui_4_test_nested4Level:
         type: org.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_cmaui:
+      disk.device.read.bytes_server_cmaui_4_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      host_server_cmaui_test_nested4Level:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
+      disk.device.read.bytes_server_cmaui_3:
+        type: org.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_cmaui:
-        type: tosca.capabilities.OperatingSystem
+      memory_server_cmaui_3:
+        type: org.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_cmaui:
+      memory.resident_server_cmaui_4_test_nested4Level:
         type: org.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_cmaui_test_nested4Level:
+      cpu_server_cmaui_3:
         type: org.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_server_cmaui_4_test_nested4Level:
+        type: tosca.capabilities.network.Bindable
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.incoming.packets_cmaui_port_5:
         type: org.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_cmaui_4_test_nested4Level:
+        type: tosca.capabilities.OperatingSystem
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.incoming.packets.rate_cmaui_port_7_test_nested4Level:
         type: org.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_cmaui_test_nested4Level:
+      disk.ephemeral.size_server_cmaui_3:
         type: org.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_cmaui_port_6:
+      cpu.delta_server_cmaui_4_test_nested4Level:
         type: org.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_cmaui_test_nested4Level:
+      network.incoming.packets_cmaui_port_6:
         type: org.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_port_7_test_nested4Level:
+      disk.capacity_server_cmaui_3:
         type: org.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_server_cmaui_test_nested4Level:
+      disk.device.capacity_server_cmaui_4_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests.rate_server_cmaui_test_nested4Level:
+      network.outgoing.bytes.rate_cmaui_port_7_test_nested4Level:
         type: org.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_cmaui_test_nested4Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      scalable_server_cmaui_4_test_nested4Level:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.requests_server_cmaui_test_nested4Level:
+      disk.device.iops_server_cmaui_4_test_nested4Level:
         type: org.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_cmaui_test_nested4Level:
+      disk.read.bytes.rate_server_cmaui_4_test_nested4Level:
         type: org.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_server_cmaui_test_nested4Level:
-        type: tosca.capabilities.network.Bindable
+      endpoint_server_cmaui_4_test_nested4Level:
+        type: tosca.capabilities.Endpoint.Admin
         occurrences:
         - 1
         - UNBOUNDED
@@ -3428,17 +3448,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.usage_server_cmaui_test_nested4Level:
+      vcpus_server_cmaui_4_test_nested4Level:
         type: org.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_cmaui:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
       binding_cmaui_port_5:
         type: tosca.capabilities.network.Bindable
         valid_source_types:
@@ -3459,30 +3474,31 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_8_test_nested4Level:
+      disk.device.write.requests_server_cmaui_3:
         type: org.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_cmaui:
+      network.outgoing.packets.rate_cmaui_port_8_test_nested4Level:
         type: org.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_cmaui:
+      disk.write.bytes_server_cmaui_4_test_nested4Level:
         type: org.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_cmaui_test_nested4Level:
-        type: tosca.capabilities.Node
+      disk.write.requests.rate_server_cmaui_4_test_nested4Level:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes.rate_server_cmaui_test_nested4Level:
+      disk.iops_server_cmaui_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -3512,32 +3528,34 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.iops_server_cmaui:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      host_server_cmaui_4_test_nested4Level:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.iops_server_cmaui:
+      cpu_util_server_cmaui_3:
         type: org.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_server_cmaui_test_nested4Level:
+      disk.device.write.bytes.rate_server_cmaui_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes_server_cmaui:
+      disk.write.bytes.rate_server_cmaui_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      scalable_server_cmaui_test_nested4Level:
-        type: tosca.capabilities.Scalable
+      disk.device.write.bytes_server_cmaui_3:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
@@ -3553,20 +3571,19 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes.rate_server_cmaui_test_nested4Level:
+      disk.iops_server_cmaui_4_test_nested4Level:
         type: org.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_5:
+      feature_server_cmaui_3:
         type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.allocation_server_cmaui_test_nested4Level:
-        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_port_5:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
@@ -3575,19 +3592,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests_server_cmaui_test_nested4Level:
-        type: org.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_cmaui:
-        type: org.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_server_cmaui_test_nested4Level:
+      cpu_server_cmaui_4_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -3598,12 +3603,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests.rate_server_cmaui_test_nested4Level:
-        type: org.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_8_test_nested4Level:
         type: tosca.capabilities.network.Bindable
         valid_source_types:
@@ -3611,19 +3610,19 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-      network.incoming.packets.rate_cmaui_port_5:
+      disk.write.bytes_server_cmaui_3:
         type: org.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_server_cmaui:
+      network.incoming.packets.rate_cmaui_port_5:
         type: org.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_server_cmaui:
+      disk.allocation_server_cmaui_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -3634,77 +3633,63 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_7_test_nested4Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      binding_server_cmaui_3:
+        type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_5:
+      vcpus_server_cmaui_3:
         type: org.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_6:
+      network.outgoing.packets.rate_cmaui_port_7_test_nested4Level:
         type: org.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_5:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
-      feature_cmaui_port_8_test_nested4Level:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.device.latency_server_cmaui:
+      instance_server_cmaui_4_test_nested4Level:
         type: org.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_cmaui:
+      network.outgoing.packets.rate_cmaui_port_5:
         type: org.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_cmaui:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      scalable_server_cmaui_3:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
-      disk.usage_server_cmaui:
+      network.outgoing.packets.rate_cmaui_port_6:
         type: org.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.usage_server_cmaui:
-        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_port_5:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_cmaui_port_7_test_nested4Level:
-        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_port_8_test_nested4Level:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.capacity_server_cmaui:
+      disk.write.requests_server_cmaui_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests.rate_server_cmaui:
+      network.outpoing.packets_cmaui_port_7_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -3715,19 +3700,19 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_cmaui_port_8_test_nested4Level:
+      disk.usage_server_cmaui_3:
         type: org.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_cmaui_test_nested4Level:
+      disk.device.write.bytes_server_cmaui_4_test_nested4Level:
         type: org.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_server_cmaui:
+      network.outgoing.bytes.rate_cmaui_port_8_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -3738,30 +3723,29 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      endpoint_server_cmaui_test_nested4Level:
+      endpoint_server_cmaui_3:
         type: tosca.capabilities.Endpoint.Admin
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_cmaui_port_6:
+      memory_server_cmaui_4_test_nested4Level:
         type: org.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_server_cmaui:
+      network.incoming.packets.rate_cmaui_port_6:
         type: org.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_cmaui_test_nested4Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      os_server_cmaui_3:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      memory.resident_server_cmaui_test_nested4Level:
+      disk.root.size_server_cmaui_4_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -3774,88 +3758,97 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-      binding_server_cmaui:
-        type: tosca.capabilities.network.Bindable
+      disk.usage_server_cmaui_4_test_nested4Level:
+        type: org.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_cmaui:
+      disk.device.latency_server_cmaui_4_test_nested4Level:
         type: org.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_cmaui:
+      disk.device.read.requests.rate_server_cmaui_4_test_nested4Level:
         type: org.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_7_test_nested4Level:
+      disk.ephemeral.size_server_cmaui_4_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes_server_cmaui_test_nested4Level:
+      disk.device.allocation_server_cmaui_3:
         type: org.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_server_cmaui_test_nested4Level:
+      disk.read.bytes_server_cmaui_4_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests_server_cmaui_test_nested4Level:
+      disk.allocation_server_cmaui_4_test_nested4Level:
         type: org.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_cmaui_test_nested4Level:
+      network.outgoing.bytes_cmaui_port_7_test_nested4Level:
         type: org.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_cmaui_port_7_test_nested4Level:
+      disk.device.allocation_server_cmaui_4_test_nested4Level:
         type: org.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_test_nested4Level:
-        type: tosca.capabilities.Node
+      host_server_cmaui_3:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
-      os_server_cmaui_test_nested4Level:
-        type: tosca.capabilities.OperatingSystem
+      disk.write.requests_server_cmaui_4_test_nested4Level:
+        type: org.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_cmaui_port_6:
+      network.incoming.packets_cmaui_port_7_test_nested4Level:
         type: org.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_cmaui:
+      feature_test_nested4Level:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.incoming.bytes.rate_cmaui_port_6:
         type: org.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_8_test_nested4Level:
+      instance_server_cmaui_3:
         type: org.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_cmaui_test_nested4Level:
+      network.incoming.packets.rate_cmaui_port_8_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -3867,19 +3860,19 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.latency_server_cmaui:
+      network.outgoing.bytes_cmaui_port_6:
         type: org.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_6:
+      network.outpoing.packets_cmaui_port_6:
         type: org.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_6:
+      disk.read.bytes.rate_server_cmaui_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -3891,56 +3884,63 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      vcpus_server_cmaui:
+      disk.device.usage_server_cmaui_4_test_nested4Level:
+        type: org.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_server_cmaui_4_test_nested4Level:
         type: org.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_server_cmaui:
+      network.incoming.bytes.rate_cmaui_port_5:
         type: org.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_cmaui_test_nested4Level:
+      disk.device.read.requests_server_cmaui_3:
         type: org.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_cmaui_test_nested4Level:
+      network.incoming.bytes_cmaui_port_7_test_nested4Level:
         type: org.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_cmaui_port_5:
+      disk.device.read.requests.rate_server_cmaui_3:
         type: org.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_cmaui:
+      cpu.delta_server_cmaui_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests_server_cmaui:
+      memory.resident_server_cmaui_3:
         type: org.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_7_test_nested4Level:
+      disk.latency_server_cmaui_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      endpoint_server_cmaui:
-        type: tosca.capabilities.Endpoint.Admin
+      memory.usage_server_cmaui_3:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
@@ -4007,47 +4007,58 @@ node_types:
         occurrences:
         - 1
         - 1
-    - dependency_cmaui_port_8:
+    - dependency_server_cmaui_4:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_cmaui_port_8:
-        capability: tosca.capabilities.network.Linkable
-        relationship: tosca.relationships.network.LinksTo
+    - local_storage_server_cmaui_4:
+        capability: tosca.capabilities.Attachment
+        node: tosca.nodes.BlockStorage
+        relationship: tosca.relationships.AttachesTo
         occurrences:
-        - 1
-        - 1
-    - dependency_server_cmaui:
+        - 0
+        - UNBOUNDED
+    - dependency_cmaui_port_8:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - local_storage_server_cmaui:
-        capability: tosca.capabilities.Attachment
-        node: tosca.nodes.BlockStorage
-        relationship: tosca.relationships.AttachesTo
+    - link_cmaui_port_8:
+        capability: tosca.capabilities.network.Linkable
+        relationship: tosca.relationships.network.LinksTo
         occurrences:
-        - 0
-        - UNBOUNDED
+        - 1
+        - 1
     capabilities:
-      cpu.delta_server_cmaui:
+      disk.write.bytes_server_cmaui_4:
+        type: org.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_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests.rate_server_cmaui:
+      feature_server_cmaui_4:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.latency_server_cmaui_4:
         type: org.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_cmaui:
+      disk.device.usage_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -4063,61 +4074,59 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      scalable_server_cmaui:
-        type: tosca.capabilities.Scalable
+      disk.read.requests_server_cmaui_4:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes.rate_server_cmaui:
+      disk.allocation_server_cmaui_4:
         type: org.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_cmaui:
+      network.outgoing.packets.rate_cmaui_port_8:
         type: org.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_server_cmaui:
-        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_port_7:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes.rate_server_cmaui:
+      vcpus_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      host_server_cmaui:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
+      binding_server_cmaui_4:
+        type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_util_server_cmaui:
+      disk.root.size_server_cmaui_4:
         type: org.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_8:
+      disk.device.write.requests.rate_server_cmaui_4:
         type: org.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_7:
+      attachment_cmaui_port_8:
         type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_cmaui_port_8:
-        type: tosca.capabilities.Attachment
+      scalable_server_cmaui_4:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
@@ -4127,121 +4136,110 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.latency_server_cmaui:
+      disk.write.requests_server_cmaui_4:
         type: org.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_cmaui:
+      disk.usage_server_cmaui_4:
         type: org.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_cmaui:
+      disk.device.capacity_server_cmaui_4:
         type: org.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_cmaui:
+      disk.device.iops_server_cmaui_4:
         type: org.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_cmaui:
+      disk.device.read.bytes.rate_server_cmaui_4:
         type: org.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.usage_server_cmaui:
-        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_cmaui_4:
+        type: tosca.capabilities.Endpoint.Admin
         occurrences:
         - 1
         - UNBOUNDED
-      disk.capacity_server_cmaui:
+      disk.read.bytes_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests.rate_server_cmaui:
+      network.incoming.packets.rate_cmaui_port_7:
         type: org.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_server_cmaui:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      os_server_cmaui_4:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      instance_server_cmaui:
+      network.incoming.packets.rate_cmaui_port_8:
         type: org.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_cmaui:
+      disk.device.allocation_server_cmaui_4:
         type: org.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_7:
+      disk.write.requests.rate_server_cmaui_4:
         type: org.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_server_cmaui:
+      disk.device.read.bytes_server_cmaui_4:
         type: org.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_8:
+      memory_server_cmaui_4:
         type: org.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_cmaui:
+      disk.write.bytes.rate_server_cmaui_4:
         type: org.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_server_cmaui:
-        type: tosca.capabilities.network.Bindable
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.device.read.requests.rate_server_cmaui:
+      cpu_server_cmaui_4:
         type: org.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_cmaui:
+      disk.capacity_server_cmaui_4:
         type: org.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_cmaui:
-        type: tosca.capabilities.OperatingSystem
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.device.write.bytes.rate_server_cmaui:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      host_server_cmaui_4:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
@@ -4263,13 +4261,13 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_cmaui_port_8:
+      instance_server_cmaui_4:
         type: org.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_cmaui:
+      network.incoming.bytes.rate_cmaui_port_8:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -4281,24 +4279,13 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.latency_server_cmaui:
-        type: org.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_cmaui:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
       network.outpoing.packets_cmaui_port_7:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      vcpus_server_cmaui:
+      disk.read.bytes.rate_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -4310,7 +4297,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes_server_cmaui:
+      disk.device.write.requests_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -4329,6 +4316,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      disk.device.read.requests_server_cmaui_4:
+        type: org.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_8:
         type: tosca.capabilities.network.Bindable
         valid_source_types:
@@ -4336,44 +4329,45 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-      disk.allocation_server_cmaui:
+      disk.iops_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests_server_cmaui:
+      disk.device.read.requests.rate_server_cmaui_4:
         type: org.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_cmaui:
+      cpu.delta_server_cmaui_4:
         type: org.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_cmaui:
+      memory.resident_server_cmaui_4:
         type: org.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_port_7:
+      disk.ephemeral.size_server_cmaui_4:
         type: org.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_8:
+      network.outgoing.bytes.rate_cmaui_port_7:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      endpoint_server_cmaui:
-        type: tosca.capabilities.Endpoint.Admin
+      network.incoming.bytes_cmaui_port_8:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
@@ -4383,7 +4377,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.iops_server_cmaui:
+      disk.latency_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -4395,13 +4389,19 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.iops_server_cmaui:
+      disk.device.write.bytes.rate_server_cmaui_4:
+        type: org.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_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes_server_cmaui:
+      cpu_util_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/nestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/nestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml
index 42b1a26b87..41205547a5 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/nestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/nestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml
@@ -85,9 +85,9 @@ topology_template:
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
-          node: server_cmaui
+          node: server_cmaui_1
           relationship: tosca.relationships.network.BindsTo
-    server_cmaui:
+    server_cmaui_1:
       type: org.openecomp.resource.vfc.nodes.heat.cmaui
       properties:
         flavor:
@@ -137,7 +137,7 @@ topology_template:
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
-          node: server_cmaui
+          node: server_cmaui_1
           relationship: tosca.relationships.network.BindsTo
   groups:
     nested1_group:
@@ -147,105 +147,111 @@ topology_template:
         description: nested1
       members:
       - cmaui_port_2
-      - server_cmaui
+      - server_cmaui_1
       - test_nested2Level
       - cmaui_port_1
   substitution_mappings:
     node_type: org.openecomp.resource.abstract.nodes.heat.nested1
     capabilities:
-      os_server_cmaui_test_nested2Level:
+      memory.resident_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - os_server_cmaui
-      disk.device.write.requests.rate_server_cmaui:
-      - server_cmaui
-      - disk.device.write.requests.rate
-      disk.device.allocation_server_cmaui:
-      - server_cmaui
-      - disk.device.allocation
-      disk.device.allocation_server_cmaui_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - disk.device.allocation_server_cmaui_test_nested3Level
+      - memory.resident_server_cmaui_3_test_nested3Level
       network.outpoing.packets_cmaui_port_6_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.outpoing.packets_cmaui_port_6_test_nested3Level
       binding_cmaui_port_6_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - binding_cmaui_port_6_test_nested3Level
-      disk.ephemeral.size_server_cmaui_test_nested3Level_test_nested2Level:
+      memory.resident_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.ephemeral.size_server_cmaui_test_nested3Level
-      disk.device.usage_server_cmaui_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - disk.device.usage_server_cmaui_test_nested3Level
-      host_server_cmaui:
-      - server_cmaui
-      - host
-      disk.device.latency_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - memory.resident_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.device.latency_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.latency
+      disk.device.latency_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.latency_server_cmaui_test_nested4Level_test_nested3Level
-      disk.write.requests_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - disk.device.latency_server_cmaui_3_test_nested3Level
+      disk.device.read.requests_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.write.requests_server_cmaui_test_nested4Level_test_nested3Level
-      feature_server_cmaui_test_nested2Level:
+      - disk.device.read.requests_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.root.size_server_cmaui_1:
+      - server_cmaui_1
+      - disk.root.size
+      scalable_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - feature_server_cmaui
+      - scalable_server_cmaui_3_test_nested3Level
       network.outgoing.bytes_cmaui_port_2:
       - cmaui_port_2
       - network.outgoing.bytes
-      endpoint_server_cmaui_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - endpoint_server_cmaui_test_nested3Level
+      disk.read.requests_server_cmaui_1:
+      - server_cmaui_1
+      - disk.read.requests
       network.outgoing.bytes_cmaui_port_1:
       - cmaui_port_1
       - network.outgoing.bytes
       binding_cmaui_port_5_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - binding_cmaui_port_5_test_nested3Level
-      disk.device.write.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      endpoint_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.device.write.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level
-      instance_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - endpoint_server_cmaui_2
+      binding_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - instance_server_cmaui_test_nested4Level_test_nested3Level
+      - binding_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.latency_server_cmaui_3_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - disk.latency_server_cmaui_3_test_nested3Level
       network.incoming.packets_cmaui_port_3_test_nested2Level:
       - test_nested2Level
       - network.incoming.packets_cmaui_port_3
-      feature_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - feature_server_cmaui_test_nested4Level_test_nested3Level
-      disk.root.size_server_cmaui_test_nested2Level:
-      - test_nested2Level
-      - disk.root.size_server_cmaui
-      disk.write.requests_server_cmaui_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - disk.write.requests_server_cmaui_test_nested3Level
       binding_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - binding_cmaui_port_8_test_nested4Level_test_nested3Level
-      disk.root.size_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.device.read.bytes.rate_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.read.bytes.rate
+      feature_server_cmaui_2_test_nested2Level:
+      - test_nested2Level
+      - feature_server_cmaui_2
+      disk.read.bytes_server_cmaui_1:
+      - server_cmaui_1
+      - disk.read.bytes
+      disk.capacity_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.root.size_server_cmaui_test_nested4Level_test_nested3Level
-      disk.usage_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - disk.capacity_server_cmaui_2
+      disk.write.bytes_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.usage_server_cmaui_test_nested4Level_test_nested3Level
-      instance_server_cmaui:
-      - server_cmaui
-      - instance
-      cpu.delta_server_cmaui_test_nested3Level_test_nested2Level:
+      - disk.write.bytes_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.device.read.bytes_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.read.bytes
+      disk.device.write.requests_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - cpu.delta_server_cmaui_test_nested3Level
+      - disk.device.write.requests_server_cmaui_2
+      disk.write.requests.rate_server_cmaui_1:
+      - server_cmaui_1
+      - disk.write.requests.rate
       network.incoming.packets.rate_cmaui_port_6_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.incoming.packets.rate_cmaui_port_6_test_nested3Level
+      disk.device.read.bytes_server_cmaui_2_test_nested2Level:
+      - test_nested2Level
+      - disk.device.read.bytes_server_cmaui_2
       network.incoming.packets_cmaui_port_4_test_nested2Level:
       - test_nested2Level
       - network.incoming.packets_cmaui_port_4
       network.incoming.bytes_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.incoming.bytes_cmaui_port_7_test_nested4Level_test_nested3Level
-      cpu_server_cmaui_test_nested2Level:
+      cpu_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - cpu_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.device.write.requests.rate_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - cpu_server_cmaui
+      - disk.device.write.requests.rate_server_cmaui_2
+      disk.latency_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - disk.latency_server_cmaui_4_test_nested4Level_test_nested3Level
       network.incoming.bytes_cmaui_port_3_test_nested2Level:
       - test_nested2Level
       - network.incoming.bytes_cmaui_port_3
@@ -255,129 +261,105 @@ topology_template:
       network.incoming.packets.rate_cmaui_port_5_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.incoming.packets.rate_cmaui_port_5_test_nested3Level
-      os_server_cmaui:
-      - server_cmaui
-      - os
-      memory.resident_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.read.bytes_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - memory.resident_server_cmaui_test_nested3Level
+      - disk.read.bytes_server_cmaui_2
       binding_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - binding_cmaui_port_7_test_nested4Level_test_nested3Level
-      os_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - os_server_cmaui_test_nested4Level_test_nested3Level
-      disk.device.read.requests.rate_server_cmaui_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - disk.device.read.requests.rate_server_cmaui_test_nested3Level
       network.incoming.bytes.rate_cmaui_port_4_test_nested2Level:
       - test_nested2Level
       - network.incoming.bytes.rate_cmaui_port_4
-      disk.write.bytes_server_cmaui_test_nested2Level:
-      - test_nested2Level
-      - disk.write.bytes_server_cmaui
-      scalable_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - scalable_server_cmaui_test_nested4Level_test_nested3Level
-      instance_server_cmaui_test_nested2Level:
-      - test_nested2Level
-      - instance_server_cmaui
       network.incoming.bytes_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.incoming.bytes_cmaui_port_8_test_nested4Level_test_nested3Level
-      endpoint_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.device.allocation_server_cmaui_2_test_nested2Level:
+      - test_nested2Level
+      - disk.device.allocation_server_cmaui_2
+      disk.ephemeral.size_server_cmaui_1:
+      - server_cmaui_1
+      - disk.ephemeral.size
+      disk.device.read.bytes_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - endpoint_server_cmaui_test_nested4Level_test_nested3Level
-      disk.ephemeral.size_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - disk.device.read.bytes_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.device.capacity_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.ephemeral.size_server_cmaui_test_nested4Level_test_nested3Level
+      - disk.device.capacity_server_cmaui_4_test_nested4Level_test_nested3Level
       network.outgoing.bytes.rate_cmaui_port_5_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.outgoing.bytes.rate_cmaui_port_5_test_nested3Level
       network.incoming.bytes.rate_cmaui_port_6_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.incoming.bytes.rate_cmaui_port_6_test_nested3Level
-      disk.device.allocation_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - disk.device.allocation_server_cmaui_test_nested4Level_test_nested3Level
-      disk.read.bytes.rate_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.device.read.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.read.bytes.rate_server_cmaui_test_nested3Level
-      disk.capacity_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - disk.device.read.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.read.bytes_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.capacity_server_cmaui_test_nested4Level_test_nested3Level
-      disk.latency_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - disk.read.bytes_server_cmaui_4_test_nested4Level_test_nested3Level
+      instance_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.latency_server_cmaui_test_nested4Level_test_nested3Level
-      feature_server_cmaui:
-      - server_cmaui
-      - feature
+      - instance_server_cmaui_3_test_nested3Level
       binding_cmaui_port_1:
       - cmaui_port_1
       - binding
       binding_cmaui_port_2:
       - cmaui_port_2
       - binding
-      binding_server_cmaui_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - binding_server_cmaui_test_nested3Level
       feature_test_nested2Level:
       - test_nested2Level
       - feature
-      memory.usage_server_cmaui:
-      - server_cmaui
-      - memory.usage
-      disk.ephemeral.size_server_cmaui:
-      - server_cmaui
-      - disk.ephemeral.size
-      os_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.write.requests_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - os_server_cmaui_test_nested3Level
-      network.incoming.packets_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - network.incoming.packets_cmaui_port_8_test_nested4Level_test_nested3Level
-      cpu_util_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - disk.write.requests_server_cmaui_3_test_nested3Level
+      disk.device.write.requests_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.write.requests
+      cpu_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - cpu_util_server_cmaui_test_nested4Level_test_nested3Level
-      disk.write.bytes_server_cmaui_test_nested3Level_test_nested2Level:
+      - cpu_server_cmaui_3_test_nested3Level
+      disk.read.requests_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.write.bytes_server_cmaui_test_nested3Level
-      disk.device.read.requests_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - disk.read.requests_server_cmaui_4_test_nested4Level_test_nested3Level
+      network.incoming.packets_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.read.requests_server_cmaui_test_nested4Level_test_nested3Level
-      disk.device.iops_server_cmaui:
-      - server_cmaui
-      - disk.device.iops
+      - network.incoming.packets_cmaui_port_8_test_nested4Level_test_nested3Level
+      disk.device.write.bytes.rate_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.write.bytes.rate
+      cpu_util_server_cmaui_1:
+      - server_cmaui_1
+      - cpu_util
       network.incoming.bytes.rate_cmaui_port_5_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.incoming.bytes.rate_cmaui_port_5_test_nested3Level
       network.incoming.bytes_cmaui_port_2:
       - cmaui_port_2
       - network.incoming.bytes
-      disk.device.iops_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - disk.device.iops_server_cmaui_test_nested4Level_test_nested3Level
       network.incoming.bytes_cmaui_port_1:
       - cmaui_port_1
       - network.incoming.bytes
       network.incoming.bytes_cmaui_port_5_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.incoming.bytes_cmaui_port_5_test_nested3Level
+      disk.write.bytes.rate_server_cmaui_1:
+      - server_cmaui_1
+      - disk.write.bytes.rate
+      disk.device.write.bytes_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.write.bytes
+      disk.device.read.requests.rate_server_cmaui_3_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - disk.device.read.requests.rate_server_cmaui_3_test_nested3Level
       network.outgoing.bytes.rate_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.outgoing.bytes.rate_cmaui_port_8_test_nested4Level_test_nested3Level
-      disk.device.read.requests_server_cmaui_test_nested2Level:
-      - test_nested2Level
-      - disk.device.read.requests_server_cmaui
       network.incoming.packets.rate_cmaui_port_1:
       - cmaui_port_1
       - network.incoming.packets.rate
       network.incoming.packets.rate_cmaui_port_2:
       - cmaui_port_2
       - network.incoming.packets.rate
-      cpu_server_cmaui:
-      - server_cmaui
-      - cpu
       network.incoming.bytes.rate_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.incoming.bytes.rate_cmaui_port_8_test_nested4Level_test_nested3Level
@@ -387,402 +369,369 @@ topology_template:
       feature_cmaui_port_2:
       - cmaui_port_2
       - feature
-      disk.device.read.bytes.rate_server_cmaui:
-      - server_cmaui
-      - disk.device.read.bytes.rate
-      disk.device.read.requests.rate_server_cmaui_test_nested2Level:
+      cpu_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.device.read.requests.rate_server_cmaui
-      disk.device.latency_server_cmaui_test_nested2Level:
+      - cpu_server_cmaui_2
+      disk.ephemeral.size_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.latency_server_cmaui
-      disk.device.latency_server_cmaui:
-      - server_cmaui
-      - disk.device.latency
-      disk.read.requests_server_cmaui:
-      - server_cmaui
-      - disk.read.requests
-      disk.usage_server_cmaui:
-      - server_cmaui
-      - disk.usage
-      disk.device.usage_server_cmaui:
-      - server_cmaui
-      - disk.device.usage
-      disk.capacity_server_cmaui:
-      - server_cmaui
-      - disk.capacity
-      disk.write.requests.rate_server_cmaui:
-      - server_cmaui
-      - disk.write.requests.rate
+      - disk.ephemeral.size_server_cmaui_3_test_nested3Level
+      binding_server_cmaui_1:
+      - server_cmaui_1
+      - binding
+      disk.root.size_server_cmaui_3_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - disk.root.size_server_cmaui_3_test_nested3Level
+      os_server_cmaui_3_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - os_server_cmaui_3_test_nested3Level
+      disk.device.read.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - disk.device.read.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level
+      cpu_util_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - cpu_util_server_cmaui_4_test_nested4Level_test_nested3Level
+      scalable_server_cmaui_1:
+      - server_cmaui_1
+      - scalable
+      disk.write.bytes_server_cmaui_3_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - disk.write.bytes_server_cmaui_3_test_nested3Level
+      memory_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - memory_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.device.write.bytes_server_cmaui_2_test_nested2Level:
+      - test_nested2Level
+      - disk.device.write.bytes_server_cmaui_2
       network.incoming.packets.rate_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.incoming.packets.rate_cmaui_port_7_test_nested4Level_test_nested3Level
-      disk.write.bytes.rate_server_cmaui_test_nested2Level:
-      - test_nested2Level
-      - disk.write.bytes.rate_server_cmaui
       network.outpoing.packets_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.outpoing.packets_cmaui_port_8_test_nested4Level_test_nested3Level
-      disk.device.read.requests_server_cmaui:
-      - server_cmaui
-      - disk.device.read.requests
-      disk.iops_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - disk.iops_server_cmaui_test_nested4Level_test_nested3Level
-      disk.device.iops_server_cmaui_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - disk.device.iops_server_cmaui_test_nested3Level
+      endpoint_server_cmaui_1:
+      - server_cmaui_1
+      - endpoint
       network.incoming.bytes.rate_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.incoming.bytes.rate_cmaui_port_7_test_nested4Level_test_nested3Level
-      disk.write.requests.rate_server_cmaui_test_nested2Level:
+      os_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.write.requests.rate_server_cmaui
-      binding_server_cmaui:
-      - server_cmaui
-      - binding
+      - os_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.usage_server_cmaui_2_test_nested2Level:
+      - test_nested2Level
+      - disk.usage_server_cmaui_2
       network.outgoing.packets.rate_cmaui_port_4_test_nested2Level:
       - test_nested2Level
       - network.outgoing.packets.rate_cmaui_port_4
-      disk.device.read.requests.rate_server_cmaui:
-      - server_cmaui
-      - disk.device.read.requests.rate
-      vcpus_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.device.read.requests.rate_server_cmaui_2_test_nested2Level:
+      - test_nested2Level
+      - disk.device.read.requests.rate_server_cmaui_2
+      disk.read.bytes.rate_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - vcpus_server_cmaui_test_nested3Level
+      - disk.read.bytes.rate_server_cmaui_3_test_nested3Level
+      disk.device.iops_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - disk.device.iops_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.device.allocation_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.allocation
       network.incoming.packets.rate_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.incoming.packets.rate_cmaui_port_8_test_nested4Level_test_nested3Level
       network.outpoing.packets_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.outpoing.packets_cmaui_port_7_test_nested4Level_test_nested3Level
-      disk.device.capacity_server_cmaui_test_nested3Level_test_nested2Level:
+      memory_server_cmaui_1:
+      - server_cmaui_1
+      - memory
+      disk.device.write.bytes_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.capacity_server_cmaui_test_nested3Level
-      disk.write.bytes_server_cmaui:
-      - server_cmaui
-      - disk.write.bytes
-      endpoint_server_cmaui_test_nested2Level:
+      - disk.device.write.bytes_server_cmaui_3_test_nested3Level
+      disk.write.requests.rate_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - endpoint_server_cmaui
+      - disk.write.requests.rate_server_cmaui_3_test_nested3Level
       network.incoming.packets_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.incoming.packets_cmaui_port_7_test_nested4Level_test_nested3Level
-      disk.write.bytes.rate_server_cmaui_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - disk.write.bytes.rate_server_cmaui_test_nested3Level
-      disk.read.bytes_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      os_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.read.bytes_server_cmaui_test_nested4Level_test_nested3Level
+      - os_server_cmaui_2
       network.outgoing.bytes_cmaui_port_5_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.outgoing.bytes_cmaui_port_5_test_nested3Level
-      cpu_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.read.requests_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - cpu_server_cmaui_test_nested3Level
-      disk.device.read.bytes.rate_server_cmaui_test_nested2Level:
+      - disk.read.requests_server_cmaui_3_test_nested3Level
+      vcpus_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.read.bytes.rate_server_cmaui
+      - vcpus_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.device.capacity_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.capacity
+      disk.device.iops_server_cmaui_2_test_nested2Level:
+      - test_nested2Level
+      - disk.device.iops_server_cmaui_2
       network.incoming.bytes_cmaui_port_4_test_nested2Level:
       - test_nested2Level
       - network.incoming.bytes_cmaui_port_4
       feature_cmaui_port_3_test_nested2Level:
       - test_nested2Level
       - feature_cmaui_port_3
+      disk.read.bytes.rate_server_cmaui_2_test_nested2Level:
+      - test_nested2Level
+      - disk.read.bytes.rate_server_cmaui_2
       network.outpoing.packets_cmaui_port_5_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.outpoing.packets_cmaui_port_5_test_nested3Level
-      disk.root.size_server_cmaui_test_nested3Level_test_nested2Level:
+      instance_server_cmaui_1:
+      - server_cmaui_1
+      - instance
+      instance_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.root.size_server_cmaui_test_nested3Level
-      memory.usage_server_cmaui_test_nested3Level_test_nested2Level:
+      - instance_server_cmaui_4_test_nested4Level_test_nested3Level
+      memory_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - memory.usage_server_cmaui_test_nested3Level
+      - memory_server_cmaui_3_test_nested3Level
       attachment_cmaui_port_3_test_nested2Level:
       - test_nested2Level
       - attachment_cmaui_port_3
-      binding_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - binding_server_cmaui_test_nested4Level_test_nested3Level
-      vcpus_server_cmaui:
-      - server_cmaui
-      - vcpus
-      disk.device.write.bytes_server_cmaui:
-      - server_cmaui
-      - disk.device.write.bytes
-      disk.read.bytes_server_cmaui_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - disk.read.bytes_server_cmaui_test_nested3Level
-      instance_server_cmaui_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - instance_server_cmaui_test_nested3Level
-      memory_server_cmaui_test_nested2Level:
-      - test_nested2Level
-      - memory_server_cmaui
-      disk.allocation_server_cmaui:
-      - server_cmaui
-      - disk.allocation
-      disk.device.write.requests_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      endpoint_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.write.requests_server_cmaui_test_nested4Level_test_nested3Level
+      - endpoint_server_cmaui_4_test_nested4Level_test_nested3Level
       network.outpoing.packets_cmaui_port_1:
       - cmaui_port_1
       - network.outpoing.packets
       network.outpoing.packets_cmaui_port_2:
       - cmaui_port_2
       - network.outpoing.packets
+      disk.device.read.requests_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.read.requests
+      cpu.delta_server_cmaui_1:
+      - server_cmaui_1
+      - cpu.delta
       attachment_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - attachment_cmaui_port_7_test_nested4Level_test_nested3Level
-      disk.ephemeral.size_server_cmaui_test_nested2Level:
-      - test_nested2Level
-      - disk.ephemeral.size_server_cmaui
-      disk.device.read.bytes_server_cmaui_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - disk.device.read.bytes_server_cmaui_test_nested3Level
-      disk.device.allocation_server_cmaui_test_nested2Level:
-      - test_nested2Level
-      - disk.device.allocation_server_cmaui
-      disk.device.iops_server_cmaui_test_nested2Level:
-      - test_nested2Level
-      - disk.device.iops_server_cmaui
-      binding_server_cmaui_test_nested2Level:
+      disk.device.read.bytes_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - binding_server_cmaui
+      - disk.device.read.bytes_server_cmaui_3_test_nested3Level
       network.outgoing.bytes_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.outgoing.bytes_cmaui_port_7_test_nested4Level_test_nested3Level
-      disk.device.write.bytes_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.write.bytes.rate_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.write.bytes_server_cmaui_test_nested4Level_test_nested3Level
-      memory.usage_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - disk.write.bytes.rate_server_cmaui_3_test_nested3Level
+      disk.device.allocation_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - memory.usage_server_cmaui_test_nested4Level_test_nested3Level
-      cpu.delta_server_cmaui:
-      - server_cmaui
-      - cpu.delta
+      - disk.device.allocation_server_cmaui_3_test_nested3Level
       feature_cmaui_port_5_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - feature_cmaui_port_5_test_nested3Level
-      disk.device.capacity_server_cmaui_test_nested2Level:
+      cpu_util_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.device.capacity_server_cmaui
+      - cpu_util_server_cmaui_2
       attachment_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - attachment_cmaui_port_8_test_nested4Level_test_nested3Level
-      disk.write.requests_server_cmaui_test_nested2Level:
+      memory.usage_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.write.requests_server_cmaui
-      scalable_server_cmaui:
-      - server_cmaui
-      - scalable
-      disk.read.bytes.rate_server_cmaui:
-      - server_cmaui
-      - disk.read.bytes.rate
-      disk.device.usage_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - memory.usage_server_cmaui_2
+      disk.device.usage_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.usage
+      disk.write.requests_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.usage_server_cmaui_test_nested4Level_test_nested3Level
-      scalable_server_cmaui_test_nested3Level_test_nested2Level:
+      - disk.write.requests_server_cmaui_4_test_nested4Level_test_nested3Level
+      feature_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - scalable_server_cmaui_test_nested3Level
-      disk.read.bytes_server_cmaui_test_nested2Level:
+      - feature_server_cmaui_3_test_nested3Level
+      disk.device.read.requests_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.read.bytes_server_cmaui
-      disk.device.latency_server_cmaui_test_nested3Level_test_nested2Level:
+      - disk.device.read.requests_server_cmaui_3_test_nested3Level
+      disk.root.size_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.latency_server_cmaui_test_nested3Level
-      cpu.delta_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - disk.root.size_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.device.write.requests.rate_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - cpu.delta_server_cmaui_test_nested4Level_test_nested3Level
+      - disk.device.write.requests.rate_server_cmaui_3_test_nested3Level
       network.outgoing.bytes_cmaui_port_3_test_nested2Level:
       - test_nested2Level
       - network.outgoing.bytes_cmaui_port_3
-      disk.usage_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.device.write.requests.rate_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.write.requests.rate
+      disk.read.requests_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.usage_server_cmaui_test_nested3Level
-      cpu_util_server_cmaui:
-      - server_cmaui
-      - cpu_util
-      disk.device.write.requests_server_cmaui:
-      - server_cmaui
-      - disk.device.write.requests
-      disk.write.requests.rate_server_cmaui_test_nested3Level_test_nested2Level:
+      - disk.read.requests_server_cmaui_2
+      feature_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - feature_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.device.write.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - disk.device.write.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.write.bytes.rate_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.write.requests.rate_server_cmaui_test_nested3Level
-      disk.capacity_server_cmaui_test_nested2Level:
+      - disk.write.bytes.rate_server_cmaui_2
+      disk.latency_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.capacity_server_cmaui
-      disk.device.write.bytes.rate_server_cmaui_test_nested2Level:
+      - disk.latency_server_cmaui_2
+      vcpus_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.write.bytes.rate_server_cmaui
+      - vcpus_server_cmaui_3_test_nested3Level
+      disk.device.iops_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.iops
       network.outgoing.bytes_cmaui_port_4_test_nested2Level:
       - test_nested2Level
       - network.outgoing.bytes_cmaui_port_4
-      disk.device.usage_server_cmaui_test_nested2Level:
+      disk.device.write.bytes_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.usage_server_cmaui
-      disk.read.requests_server_cmaui_test_nested3Level_test_nested2Level:
+      - disk.device.write.bytes_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.device.usage_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.read.requests_server_cmaui_test_nested3Level
-      disk.device.read.bytes_server_cmaui:
-      - server_cmaui
-      - disk.device.read.bytes
+      - disk.device.usage_server_cmaui_4_test_nested4Level_test_nested3Level
       network.incoming.packets_cmaui_port_5_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.incoming.packets_cmaui_port_5_test_nested3Level
-      cpu_util_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.capacity_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - cpu_util_server_cmaui_test_nested3Level
-      disk.root.size_server_cmaui:
-      - server_cmaui
-      - disk.root.size
-      disk.latency_server_cmaui_test_nested3Level_test_nested2Level:
+      - disk.capacity_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.device.write.bytes.rate_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.latency_server_cmaui_test_nested3Level
-      disk.device.write.requests.rate_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - disk.device.write.bytes.rate_server_cmaui_2
+      disk.device.read.requests_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.device.write.requests.rate_server_cmaui_test_nested4Level_test_nested3Level
-      vcpus_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - disk.device.read.requests_server_cmaui_2
+      cpu_server_cmaui_1:
+      - server_cmaui_1
+      - cpu
+      memory.resident_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - vcpus_server_cmaui_test_nested4Level_test_nested3Level
-      disk.capacity_server_cmaui_test_nested3Level_test_nested2Level:
+      - memory.resident_server_cmaui_2
+      disk.device.iops_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.capacity_server_cmaui_test_nested3Level
-      disk.device.write.requests.rate_server_cmaui_test_nested2Level:
+      - disk.device.iops_server_cmaui_3_test_nested3Level
+      disk.allocation_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.device.write.requests.rate_server_cmaui
+      - disk.allocation_server_cmaui_2
       network.incoming.packets_cmaui_port_2:
       - cmaui_port_2
       - network.incoming.packets
-      disk.device.write.bytes.rate_server_cmaui:
-      - server_cmaui
-      - disk.device.write.bytes.rate
-      disk.device.read.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - disk.device.read.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level
       network.outgoing.packets.rate_cmaui_port_6_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.outgoing.packets.rate_cmaui_port_6_test_nested3Level
       network.incoming.packets_cmaui_port_1:
       - cmaui_port_1
       - network.incoming.packets
-      disk.device.read.bytes_server_cmaui_test_nested2Level:
+      memory.usage_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - memory.usage_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.device.write.requests_server_cmaui_3_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - disk.device.write.requests_server_cmaui_3_test_nested3Level
+      disk.write.requests_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.device.read.bytes_server_cmaui
-      disk.device.write.requests.rate_server_cmaui_test_nested3Level_test_nested2Level:
+      - disk.write.requests_server_cmaui_2
+      disk.capacity_server_cmaui_1:
+      - server_cmaui_1
+      - disk.capacity
+      disk.read.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - disk.read.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.write.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.write.requests.rate_server_cmaui_test_nested3Level
-      cpu_util_server_cmaui_test_nested2Level:
+      - disk.write.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level
+      scalable_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - cpu_util_server_cmaui
+      - scalable_server_cmaui_4_test_nested4Level_test_nested3Level
       network.outgoing.packets.rate_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.outgoing.packets.rate_cmaui_port_8_test_nested4Level_test_nested3Level
       network.outpoing.packets_cmaui_port_3_test_nested2Level:
       - test_nested2Level
       - network.outpoing.packets_cmaui_port_3
-      disk.write.requests.rate_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - disk.write.requests.rate_server_cmaui_test_nested4Level_test_nested3Level
-      disk.device.write.bytes_server_cmaui_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - disk.device.write.bytes_server_cmaui_test_nested3Level
-      host_server_cmaui_test_nested2Level:
-      - test_nested2Level
-      - host_server_cmaui
       network.incoming.packets_cmaui_port_6_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.incoming.packets_cmaui_port_6_test_nested3Level
-      memory_server_cmaui_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - memory_server_cmaui_test_nested3Level
       binding_cmaui_port_4_test_nested2Level:
       - test_nested2Level
       - binding_cmaui_port_4
-      disk.device.read.bytes.rate_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.allocation_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.read.bytes.rate_server_cmaui_test_nested3Level
+      - disk.allocation_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.device.read.bytes.rate_server_cmaui_2_test_nested2Level:
+      - test_nested2Level
+      - disk.device.read.bytes.rate_server_cmaui_2
       network.incoming.packets.rate_cmaui_port_4_test_nested2Level:
       - test_nested2Level
       - network.incoming.packets.rate_cmaui_port_4
       feature_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - feature_test_nested4Level_test_nested3Level
-      disk.latency_server_cmaui_test_nested2Level:
-      - test_nested2Level
-      - disk.latency_server_cmaui
-      disk.device.write.requests_server_cmaui_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - disk.device.write.requests_server_cmaui_test_nested3Level
-      vcpus_server_cmaui_test_nested2Level:
+      disk.iops_server_cmaui_1:
+      - server_cmaui_1
+      - disk.iops
+      disk.device.usage_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - vcpus_server_cmaui
+      - disk.device.usage_server_cmaui_2
       feature_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - feature_cmaui_port_8_test_nested4Level_test_nested3Level
-      disk.device.write.bytes.rate_server_cmaui_test_nested3Level_test_nested2Level:
+      cpu.delta_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - cpu.delta_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.device.write.bytes.rate_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.write.bytes.rate_server_cmaui_test_nested3Level
+      - disk.device.write.bytes.rate_server_cmaui_3_test_nested3Level
       network.outgoing.bytes.rate_cmaui_port_2:
       - cmaui_port_2
       - network.outgoing.bytes.rate
-      disk.iops_server_cmaui_test_nested2Level:
-      - test_nested2Level
-      - disk.iops_server_cmaui
       network.outgoing.bytes.rate_cmaui_port_1:
       - cmaui_port_1
       - network.outgoing.bytes.rate
       attachment_cmaui_port_4_test_nested2Level:
       - test_nested2Level
       - attachment_cmaui_port_4
-      memory.usage_server_cmaui_test_nested2Level:
-      - test_nested2Level
-      - memory.usage_server_cmaui
-      disk.iops_server_cmaui:
-      - server_cmaui
-      - disk.iops
       network.outgoing.packets.rate_cmaui_port_5_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.outgoing.packets.rate_cmaui_port_5_test_nested3Level
       network.outgoing.bytes.rate_cmaui_port_4_test_nested2Level:
       - test_nested2Level
       - network.outgoing.bytes.rate_cmaui_port_4
-      disk.read.bytes_server_cmaui:
-      - server_cmaui
-      - disk.read.bytes
-      disk.read.requests_server_cmaui_test_nested2Level:
+      endpoint_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.read.requests_server_cmaui
-      feature_server_cmaui_test_nested3Level_test_nested2Level:
+      - endpoint_server_cmaui_3_test_nested3Level
+      binding_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - feature_server_cmaui_test_nested3Level
-      memory_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - binding_server_cmaui_3_test_nested3Level
+      disk.ephemeral.size_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - memory_server_cmaui_test_nested4Level_test_nested3Level
-      cpu_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - disk.ephemeral.size_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.iops_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - cpu_server_cmaui_test_nested4Level_test_nested3Level
-      disk.write.bytes.rate_server_cmaui:
-      - server_cmaui
-      - disk.write.bytes.rate
-      disk.iops_server_cmaui_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - disk.iops_server_cmaui_test_nested3Level
-      disk.device.read.bytes_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - disk.iops_server_cmaui_2
+      disk.write.bytes_server_cmaui_1:
+      - server_cmaui_1
+      - disk.write.bytes
+      feature_server_cmaui_1:
+      - server_cmaui_1
+      - feature
+      disk.allocation_server_cmaui_1:
+      - server_cmaui_1
+      - disk.allocation
+      disk.iops_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.read.bytes_server_cmaui_test_nested4Level_test_nested3Level
+      - disk.iops_server_cmaui_4_test_nested4Level_test_nested3Level
       network.outgoing.bytes_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.outgoing.bytes_cmaui_port_8_test_nested4Level_test_nested3Level
-      disk.device.read.requests.rate_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - disk.device.read.requests.rate_server_cmaui_test_nested4Level_test_nested3Level
       attachment_cmaui_port_2:
       - cmaui_port_2
       - attachment
-      disk.device.capacity_server_cmaui:
-      - server_cmaui
-      - disk.device.capacity
+      instance_server_cmaui_2_test_nested2Level:
+      - test_nested2Level
+      - instance_server_cmaui_2
       network.outgoing.packets.rate_cmaui_port_1:
       - cmaui_port_1
       - network.outgoing.packets.rate
@@ -792,39 +741,51 @@ topology_template:
       network.incoming.packets.rate_cmaui_port_3_test_nested2Level:
       - test_nested2Level
       - network.incoming.packets.rate_cmaui_port_3
+      disk.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - disk.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level
       attachment_cmaui_port_1:
       - cmaui_port_1
       - attachment
-      disk.device.write.bytes_server_cmaui_test_nested2Level:
-      - test_nested2Level
-      - disk.device.write.bytes_server_cmaui
       network.outgoing.packets.rate_cmaui_port_3_test_nested2Level:
       - test_nested2Level
       - network.outgoing.packets.rate_cmaui_port_3
       network.outgoing.bytes.rate_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.outgoing.bytes.rate_cmaui_port_7_test_nested4Level_test_nested3Level
-      disk.device.read.requests_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.write.requests_server_cmaui_1:
+      - server_cmaui_1
+      - disk.write.requests
+      disk.read.bytes_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.read.requests_server_cmaui_test_nested3Level
+      - disk.read.bytes_server_cmaui_3_test_nested3Level
+      cpu.delta_server_cmaui_3_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - cpu.delta_server_cmaui_3_test_nested3Level
+      disk.usage_server_cmaui_1:
+      - server_cmaui_1
+      - disk.usage
       network.incoming.bytes_cmaui_port_6_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.incoming.bytes_cmaui_port_6_test_nested3Level
-      disk.write.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      memory_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.write.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level
-      disk.read.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - memory_server_cmaui_2
+      disk.usage_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.read.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level
-      memory_server_cmaui:
-      - server_cmaui
-      - memory
-      scalable_server_cmaui_test_nested2Level:
+      - disk.usage_server_cmaui_3_test_nested3Level
+      disk.device.allocation_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - scalable_server_cmaui
-      disk.usage_server_cmaui_test_nested2Level:
+      - disk.device.allocation_server_cmaui_4_test_nested4Level_test_nested3Level
+      os_server_cmaui_1:
+      - server_cmaui_1
+      - os
+      disk.device.latency_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - disk.device.latency_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.root.size_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.usage_server_cmaui
+      - disk.root.size_server_cmaui_2
       feature_cmaui_port_4_test_nested2Level:
       - test_nested2Level
       - feature_cmaui_port_4
@@ -834,51 +795,72 @@ topology_template:
       attachment_cmaui_port_5_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - attachment_cmaui_port_5_test_nested3Level
-      disk.device.capacity_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      cpu_util_server_cmaui_3_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - cpu_util_server_cmaui_3_test_nested3Level
+      disk.device.latency_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.device.capacity_server_cmaui_test_nested4Level_test_nested3Level
-      disk.write.bytes_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - disk.device.latency_server_cmaui_2
+      disk.allocation_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.write.bytes_server_cmaui_test_nested4Level_test_nested3Level
-      memory.resident_server_cmaui_test_nested2Level:
+      - disk.allocation_server_cmaui_3_test_nested3Level
+      disk.ephemeral.size_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - memory.resident_server_cmaui
+      - disk.ephemeral.size_server_cmaui_2
+      disk.usage_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - disk.usage_server_cmaui_4_test_nested4Level_test_nested3Level
       network.outgoing.packets.rate_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.outgoing.packets.rate_cmaui_port_7_test_nested4Level_test_nested3Level
-      host_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      host_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - host_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.capacity_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - host_server_cmaui_test_nested4Level_test_nested3Level
+      - disk.capacity_server_cmaui_3_test_nested3Level
+      host_server_cmaui_1:
+      - server_cmaui_1
+      - host
       feature_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - feature_cmaui_port_7_test_nested4Level_test_nested3Level
-      host_server_cmaui_test_nested3Level_test_nested2Level:
+      binding_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - host_server_cmaui_test_nested3Level
+      - binding_server_cmaui_2
+      cpu.delta_server_cmaui_2_test_nested2Level:
+      - test_nested2Level
+      - cpu.delta_server_cmaui_2
       network.outpoing.packets_cmaui_port_4_test_nested2Level:
       - test_nested2Level
       - network.outpoing.packets_cmaui_port_4
       binding_cmaui_port_3_test_nested2Level:
       - test_nested2Level
       - binding_cmaui_port_3
-      disk.device.write.requests_server_cmaui_test_nested2Level:
+      disk.device.capacity_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.device.write.requests_server_cmaui
-      memory.resident_server_cmaui:
-      - server_cmaui
-      - memory.resident
-      disk.read.bytes.rate_server_cmaui_test_nested2Level:
+      - disk.device.capacity_server_cmaui_2
+      disk.device.write.requests_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.read.bytes.rate_server_cmaui
-      disk.latency_server_cmaui:
-      - server_cmaui
-      - disk.latency
-      disk.allocation_server_cmaui_test_nested2Level:
+      - disk.device.write.requests_server_cmaui_4_test_nested4Level_test_nested3Level
+      memory.usage_server_cmaui_3_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - memory.usage_server_cmaui_3_test_nested3Level
+      scalable_server_cmaui_2_test_nested2Level:
+      - test_nested2Level
+      - scalable_server_cmaui_2
+      host_server_cmaui_3_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - host_server_cmaui_3_test_nested3Level
+      disk.iops_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.allocation_server_cmaui
-      disk.allocation_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - disk.iops_server_cmaui_3_test_nested3Level
+      vcpus_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.allocation_server_cmaui_test_nested4Level_test_nested3Level
+      - vcpus_server_cmaui_2
+      disk.device.read.requests.rate_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.read.requests.rate
       network.outgoing.bytes_cmaui_port_6_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.outgoing.bytes_cmaui_port_6_test_nested3Level
@@ -888,40 +870,58 @@ topology_template:
       network.incoming.bytes.rate_cmaui_port_2:
       - cmaui_port_2
       - network.incoming.bytes.rate
-      disk.write.requests_server_cmaui:
-      - server_cmaui
-      - disk.write.requests
-      cpu.delta_server_cmaui_test_nested2Level:
+      disk.device.read.bytes.rate_server_cmaui_3_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - disk.device.read.bytes.rate_server_cmaui_3_test_nested3Level
+      vcpus_server_cmaui_1:
+      - server_cmaui_1
+      - vcpus
+      disk.write.requests.rate_server_cmaui_2_test_nested2Level:
+      - test_nested2Level
+      - disk.write.requests.rate_server_cmaui_2
+      disk.write.bytes_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - cpu.delta_server_cmaui
+      - disk.write.bytes_server_cmaui_2
       feature_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - feature_test_nested3Level
       feature_cmaui_port_6_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - feature_cmaui_port_6_test_nested3Level
+      disk.device.usage_server_cmaui_3_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - disk.device.usage_server_cmaui_3_test_nested3Level
+      disk.read.bytes.rate_server_cmaui_1:
+      - server_cmaui_1
+      - disk.read.bytes.rate
       network.outgoing.bytes.rate_cmaui_port_3_test_nested2Level:
       - test_nested2Level
       - network.outgoing.bytes.rate_cmaui_port_3
-      memory.resident_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.device.capacity_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - memory.resident_server_cmaui_test_nested4Level_test_nested3Level
+      - disk.device.capacity_server_cmaui_3_test_nested3Level
       network.incoming.bytes.rate_cmaui_port_3_test_nested2Level:
       - test_nested2Level
       - network.incoming.bytes.rate_cmaui_port_3
-      endpoint_server_cmaui:
-      - server_cmaui
-      - endpoint
-      disk.read.requests_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      memory.resident_server_cmaui_1:
+      - server_cmaui_1
+      - memory.resident
+      disk.device.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.read.requests_server_cmaui_test_nested4Level_test_nested3Level
-      disk.allocation_server_cmaui_test_nested3Level_test_nested2Level:
+      - disk.device.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.latency_server_cmaui_1:
+      - server_cmaui_1
+      - disk.latency
+      host_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.allocation_server_cmaui_test_nested3Level
+      - host_server_cmaui_2
+      memory.usage_server_cmaui_1:
+      - server_cmaui_1
+      - memory.usage
     requirements:
-      dependency_server_cmaui:
-      - server_cmaui
-      - dependency
+      local_storage_server_cmaui_2_test_nested2Level:
+      - test_nested2Level
+      - local_storage_server_cmaui_2
       link_cmaui_port_5_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - link_cmaui_port_5_test_nested3Level
@@ -946,42 +946,42 @@ topology_template:
       link_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - link_cmaui_port_7_test_nested4Level_test_nested3Level
-      dependency_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - dependency_server_cmaui_test_nested4Level_test_nested3Level
       dependency_cmaui_port_3_test_nested2Level:
       - test_nested2Level
       - dependency_cmaui_port_3
+      dependency_server_cmaui_2_test_nested2Level:
+      - test_nested2Level
+      - dependency_server_cmaui_2
+      local_storage_server_cmaui_3_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - local_storage_server_cmaui_3_test_nested3Level
       dependency_cmaui_port_1:
       - cmaui_port_1
       - dependency
+      dependency_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - dependency_server_cmaui_4_test_nested4Level_test_nested3Level
       link_cmaui_port_6_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - link_cmaui_port_6_test_nested3Level
-      dependency_server_cmaui_test_nested2Level:
-      - test_nested2Level
-      - dependency_server_cmaui
       dependency_cmaui_port_2:
       - cmaui_port_2
       - dependency
       link_cmaui_port_4_test_nested2Level:
       - test_nested2Level
       - link_cmaui_port_4
-      dependency_cmaui_port_5_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - dependency_cmaui_port_5_test_nested3Level
-      local_storage_server_cmaui:
-      - server_cmaui
-      - local_storage
-      local_storage_server_cmaui_test_nested2Level:
+      local_storage_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - local_storage_server_cmaui
-      dependency_server_cmaui_test_nested3Level_test_nested2Level:
+      - local_storage_server_cmaui_4_test_nested4Level_test_nested3Level
+      dependency_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - dependency_server_cmaui_test_nested3Level
-      local_storage_server_cmaui_test_nested3Level_test_nested2Level:
+      - dependency_server_cmaui_3_test_nested3Level
+      local_storage_server_cmaui_1:
+      - server_cmaui_1
+      - local_storage
+      dependency_cmaui_port_5_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - local_storage_server_cmaui_test_nested3Level
+      - dependency_cmaui_port_5_test_nested3Level
       link_cmaui_port_3_test_nested2Level:
       - test_nested2Level
       - link_cmaui_port_3
@@ -994,9 +994,9 @@ topology_template:
       dependency_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - dependency_test_nested3Level
-      local_storage_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - local_storage_server_cmaui_test_nested4Level_test_nested3Level
+      dependency_server_cmaui_1:
+      - server_cmaui_1
+      - dependency
       dependency_cmaui_port_4_test_nested2Level:
       - test_nested2Level
       - dependency_cmaui_port_4
\ 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/securityrulestoportconnection/nestedMultiLevels/expectedoutputfiles/nested2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/nestedMultiLevels/expectedoutputfiles/nested2ServiceTemplate.yaml
index c2319a006c..2d592aa6e9 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/nestedMultiLevels/expectedoutputfiles/nested2ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/nestedMultiLevels/expectedoutputfiles/nested2ServiceTemplate.yaml
@@ -86,8 +86,21 @@ topology_template:
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
-          node: server_cmaui
+          node: server_cmaui_2
           relationship: tosca.relationships.network.BindsTo
+    server_cmaui_2:
+      type: org.openecomp.resource.vfc.nodes.heat.cmaui
+      properties:
+        flavor:
+          get_input: cmaui_flavor
+        availability_zone:
+          get_input: availability_zone_0
+        image:
+          get_input: cmaui_image
+        name:
+          get_input:
+          - cmaui_names
+          - 0
     cmaui_port_4:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
@@ -113,7 +126,7 @@ topology_template:
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
-          node: server_cmaui
+          node: server_cmaui_2
           relationship: tosca.relationships.network.BindsTo
     test_nested3Level:
       type: org.openecomp.resource.abstract.nodes.heat.nested3
@@ -133,19 +146,6 @@ topology_template:
           - SELF
           - service_template_filter
           - index_value
-    server_cmaui:
-      type: org.openecomp.resource.vfc.nodes.heat.cmaui
-      properties:
-        flavor:
-          get_input: cmaui_flavor
-        availability_zone:
-          get_input: availability_zone_0
-        image:
-          get_input: cmaui_image
-        name:
-          get_input:
-          - cmaui_names
-          - 0
   groups:
     nested2_group:
       type: org.openecomp.groups.heat.HeatStack
@@ -154,510 +154,495 @@ topology_template:
         description: nested2
       members:
       - cmaui_port_3
+      - server_cmaui_2
       - cmaui_port_4
       - test_nested3Level
-      - server_cmaui
   substitution_mappings:
     node_type: org.openecomp.resource.abstract.nodes.heat.nested2
     capabilities:
-      cpu.delta_server_cmaui:
-      - server_cmaui
-      - cpu.delta
-      disk.device.write.requests.rate_server_cmaui:
-      - server_cmaui
-      - disk.device.write.requests.rate
-      disk.write.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.write.bytes.rate_server_cmaui_test_nested4Level
-      vcpus_server_cmaui_test_nested3Level:
+      instance_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - vcpus_server_cmaui
-      disk.device.allocation_server_cmaui:
-      - server_cmaui
-      - disk.device.allocation
-      disk.latency_server_cmaui_test_nested3Level:
+      - instance_server_cmaui_4_test_nested4Level
+      memory.usage_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - disk.latency_server_cmaui
-      disk.device.capacity_server_cmaui_test_nested4Level_test_nested3Level:
+      - memory.usage_server_cmaui_3
+      cpu_util_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - disk.device.capacity_server_cmaui_test_nested4Level
-      scalable_server_cmaui:
-      - server_cmaui
-      - scalable
-      disk.read.bytes.rate_server_cmaui:
-      - server_cmaui
-      - disk.read.bytes.rate
-      memory.resident_server_cmaui_test_nested4Level_test_nested3Level:
+      - cpu_util_server_cmaui_3
+      disk.device.usage_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.usage
+      disk.device.usage_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - memory.resident_server_cmaui_test_nested4Level
+      - disk.device.usage_server_cmaui_4_test_nested4Level
+      disk.device.latency_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.latency
       network.incoming.bytes_cmaui_port_7_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.incoming.bytes_cmaui_port_7_test_nested4Level
-      disk.capacity_server_cmaui_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.capacity_server_cmaui_test_nested4Level
-      host_server_cmaui:
-      - server_cmaui
-      - host
-      cpu_util_server_cmaui:
-      - server_cmaui
-      - cpu_util
-      os_server_cmaui_test_nested3Level:
+      disk.usage_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - os_server_cmaui
-      disk.device.read.bytes_server_cmaui_test_nested4Level_test_nested3Level:
+      - disk.usage_server_cmaui_4_test_nested4Level
+      disk.root.size_server_cmaui_2:
+      - server_cmaui_2
+      - disk.root.size
+      disk.device.write.requests.rate_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.write.requests.rate
+      disk.read.requests_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - disk.device.read.bytes_server_cmaui_test_nested4Level
-      disk.device.read.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level:
+      - disk.read.requests_server_cmaui_3
+      disk.latency_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - disk.device.read.bytes.rate_server_cmaui_test_nested4Level
-      memory.usage_server_cmaui_test_nested4Level_test_nested3Level:
+      - disk.latency_server_cmaui_3
+      disk.write.bytes.rate_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - memory.usage_server_cmaui_test_nested4Level
+      - disk.write.bytes.rate_server_cmaui_3
       network.outgoing.bytes_cmaui_port_3:
       - cmaui_port_3
       - network.outgoing.bytes
-      disk.device.write.requests_server_cmaui:
-      - server_cmaui
-      - disk.device.write.requests
-      instance_server_cmaui_test_nested4Level_test_nested3Level:
+      endpoint_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - endpoint_server_cmaui_4_test_nested4Level
+      disk.read.requests_server_cmaui_2:
+      - server_cmaui_2
+      - disk.read.requests
+      cpu_util_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - instance_server_cmaui_test_nested4Level
-      disk.device.capacity_server_cmaui_test_nested3Level:
+      - cpu_util_server_cmaui_4_test_nested4Level
+      disk.write.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - disk.device.capacity_server_cmaui
+      - disk.write.bytes.rate_server_cmaui_4_test_nested4Level
       feature_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - feature_test_nested4Level
-      disk.read.bytes_server_cmaui_test_nested3Level:
-      - test_nested3Level
-      - disk.read.bytes_server_cmaui
-      disk.device.write.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.device.write.bytes.rate_server_cmaui_test_nested4Level
       network.outgoing.bytes.rate_cmaui_port_8_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.outgoing.bytes.rate_cmaui_port_8_test_nested4Level
-      feature_server_cmaui_test_nested3Level:
+      disk.device.iops_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.iops
+      disk.device.write.bytes_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - feature_server_cmaui
+      - disk.device.write.bytes_server_cmaui_4_test_nested4Level
+      disk.device.capacity_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.capacity
       attachment_cmaui_port_7_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - attachment_cmaui_port_7_test_nested4Level
-      memory.usage_server_cmaui_test_nested3Level:
+      host_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - memory.usage_server_cmaui
-      instance_server_cmaui:
-      - server_cmaui
-      - instance
-      disk.device.read.bytes_server_cmaui:
-      - server_cmaui
+      - host_server_cmaui_4_test_nested4Level
+      disk.device.read.bytes.rate_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.read.bytes.rate
+      disk.ephemeral.size_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - disk.ephemeral.size_server_cmaui_4_test_nested4Level
+      disk.read.bytes_server_cmaui_2:
+      - server_cmaui_2
+      - disk.read.bytes
+      disk.device.read.bytes_server_cmaui_2:
+      - server_cmaui_2
       - disk.device.read.bytes
-      binding_server_cmaui_test_nested3Level:
+      disk.device.capacity_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - binding_server_cmaui
-      disk.root.size_server_cmaui:
-      - server_cmaui
-      - disk.root.size
-      memory_server_cmaui_test_nested3Level:
+      - disk.device.capacity_server_cmaui_4_test_nested4Level
+      disk.root.size_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - disk.root.size_server_cmaui_4_test_nested4Level
+      disk.write.requests.rate_server_cmaui_2:
+      - server_cmaui_2
+      - disk.write.requests.rate
+      disk.iops_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - memory_server_cmaui
+      - disk.iops_server_cmaui_4_test_nested4Level
       network.outgoing.bytes.rate_cmaui_port_5_test_nested3Level:
       - test_nested3Level
       - network.outgoing.bytes.rate_cmaui_port_5
+      memory_server_cmaui_2:
+      - server_cmaui_2
+      - memory
+      cpu_server_cmaui_2:
+      - server_cmaui_2
+      - cpu
+      host_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - host_server_cmaui_3
       network.incoming.packets_cmaui_port_3:
       - cmaui_port_3
       - network.incoming.packets
-      os_server_cmaui:
-      - server_cmaui
-      - os
-      disk.device.write.bytes.rate_server_cmaui:
-      - server_cmaui
-      - disk.device.write.bytes.rate
+      disk.allocation_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - disk.allocation_server_cmaui_3
+      memory_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - memory_server_cmaui_4_test_nested4Level
       network.incoming.packets_cmaui_port_4:
       - cmaui_port_4
       - network.incoming.packets
-      disk.device.latency_server_cmaui_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.device.latency_server_cmaui_test_nested4Level
       network.outgoing.bytes_cmaui_port_6_test_nested3Level:
       - test_nested3Level
       - network.outgoing.bytes_cmaui_port_6
       network.outgoing.bytes_cmaui_port_7_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.outgoing.bytes_cmaui_port_7_test_nested4Level
-      disk.ephemeral.size_server_cmaui_test_nested3Level:
-      - test_nested3Level
-      - disk.ephemeral.size_server_cmaui
       network.incoming.packets.rate_cmaui_port_6_test_nested3Level:
       - test_nested3Level
       - network.incoming.packets.rate_cmaui_port_6
-      disk.write.requests.rate_server_cmaui_test_nested4Level_test_nested3Level:
+      disk.ephemeral.size_server_cmaui_2:
+      - server_cmaui_2
+      - disk.ephemeral.size
+      cpu.delta_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - cpu.delta_server_cmaui_4_test_nested4Level
+      disk.write.requests_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - disk.write.requests.rate_server_cmaui_test_nested4Level
+      - disk.write.requests_server_cmaui_3
       network.outpoing.packets_cmaui_port_5_test_nested3Level:
       - test_nested3Level
       - network.outpoing.packets_cmaui_port_5
-      vcpus_server_cmaui_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - vcpus_server_cmaui_test_nested4Level
+      disk.capacity_server_cmaui_2:
+      - server_cmaui_2
+      - disk.capacity
       network.incoming.packets_cmaui_port_6_test_nested3Level:
       - test_nested3Level
       - network.incoming.packets_cmaui_port_6
-      cpu_util_server_cmaui_test_nested3Level:
-      - test_nested3Level
-      - cpu_util_server_cmaui
       network.incoming.bytes_cmaui_port_8_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.incoming.bytes_cmaui_port_8_test_nested4Level
-      endpoint_server_cmaui_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - endpoint_server_cmaui_test_nested4Level
       network.outgoing.bytes.rate_cmaui_port_6_test_nested3Level:
       - test_nested3Level
       - network.outgoing.bytes.rate_cmaui_port_6
-      disk.allocation_server_cmaui_test_nested3Level:
+      disk.read.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - disk.allocation_server_cmaui
-      memory.resident_server_cmaui_test_nested3Level:
+      - disk.read.bytes.rate_server_cmaui_4_test_nested4Level
+      disk.read.bytes.rate_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - memory.resident_server_cmaui
-      disk.ephemeral.size_server_cmaui_test_nested4Level_test_nested3Level:
+      - disk.read.bytes.rate_server_cmaui_3
+      disk.device.iops_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - disk.ephemeral.size_server_cmaui_test_nested4Level
-      cpu.delta_server_cmaui_test_nested3Level:
-      - test_nested3Level
-      - cpu.delta_server_cmaui
-      disk.device.read.bytes_server_cmaui_test_nested3Level:
-      - test_nested3Level
-      - disk.device.read.bytes_server_cmaui
-      disk.device.read.requests_server_cmaui_test_nested3Level:
-      - test_nested3Level
-      - disk.device.read.requests_server_cmaui
-      disk.write.requests_server_cmaui_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.write.requests_server_cmaui_test_nested4Level
-      feature_server_cmaui:
-      - server_cmaui
-      - feature
+      - disk.device.iops_server_cmaui_4_test_nested4Level
       binding_cmaui_port_3:
       - cmaui_port_3
       - binding
-      disk.device.read.bytes.rate_server_cmaui_test_nested3Level:
-      - test_nested3Level
-      - disk.device.read.bytes.rate_server_cmaui
+      disk.iops_server_cmaui_2:
+      - server_cmaui_2
+      - disk.iops
       binding_cmaui_port_4:
       - cmaui_port_4
       - binding
-      disk.device.write.requests_server_cmaui_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.device.write.requests_server_cmaui_test_nested4Level
-      endpoint_server_cmaui_test_nested3Level:
-      - test_nested3Level
-      - endpoint_server_cmaui
-      disk.device.write.requests_server_cmaui_test_nested3Level:
-      - test_nested3Level
-      - disk.device.write.requests_server_cmaui
-      memory.usage_server_cmaui:
-      - server_cmaui
-      - memory.usage
+      disk.device.write.requests_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.write.requests
       feature_cmaui_port_6_test_nested3Level:
       - test_nested3Level
       - feature_cmaui_port_6
       feature_cmaui_port_8_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - feature_cmaui_port_8_test_nested4Level
-      disk.ephemeral.size_server_cmaui:
-      - server_cmaui
-      - disk.ephemeral.size
+      memory_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - memory_server_cmaui_3
       network.incoming.bytes.rate_cmaui_port_6_test_nested3Level:
       - test_nested3Level
       - network.incoming.bytes.rate_cmaui_port_6
-      memory_server_cmaui_test_nested4Level_test_nested3Level:
+      feature_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - memory_server_cmaui_test_nested4Level
+      - feature_server_cmaui_3
       network.outgoing.bytes.rate_cmaui_port_3:
       - cmaui_port_3
       - network.outgoing.bytes.rate
-      disk.device.usage_server_cmaui_test_nested3Level:
+      disk.device.write.bytes.rate_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - disk.device.write.bytes.rate_server_cmaui_3
+      disk.root.size_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - disk.device.usage_server_cmaui
+      - disk.root.size_server_cmaui_3
       network.outgoing.bytes.rate_cmaui_port_4:
       - cmaui_port_4
       - network.outgoing.bytes.rate
       binding_cmaui_port_6_test_nested3Level:
       - test_nested3Level
       - binding_cmaui_port_6
-      disk.iops_server_cmaui:
-      - server_cmaui
-      - disk.iops
+      disk.usage_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - disk.usage_server_cmaui_3
+      os_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - os_server_cmaui_4_test_nested4Level
+      disk.device.write.requests_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - disk.device.write.requests_server_cmaui_3
       network.incoming.bytes_cmaui_port_4:
       - cmaui_port_4
       - network.incoming.bytes
-      disk.iops_server_cmaui_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.iops_server_cmaui_test_nested4Level
       network.incoming.bytes_cmaui_port_3:
       - cmaui_port_3
       - network.incoming.bytes
-      disk.device.iops_server_cmaui:
-      - server_cmaui
-      - disk.device.iops
-      disk.read.bytes_server_cmaui:
-      - server_cmaui
-      - disk.read.bytes
-      disk.root.size_server_cmaui_test_nested3Level:
+      disk.device.read.requests.rate_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - disk.device.read.requests.rate_server_cmaui_3
+      disk.device.latency_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - disk.device.latency_server_cmaui_3
+      cpu_util_server_cmaui_2:
+      - server_cmaui_2
+      - cpu_util
+      memory.usage_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - memory.usage_server_cmaui_4_test_nested4Level
+      disk.device.write.requests.rate_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - disk.root.size_server_cmaui
+      - disk.device.write.requests.rate_server_cmaui_3
       network.outgoing.bytes_cmaui_port_8_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.outgoing.bytes_cmaui_port_8_test_nested4Level
+      disk.device.write.bytes.rate_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.write.bytes.rate
+      disk.write.bytes.rate_server_cmaui_2:
+      - server_cmaui_2
+      - disk.write.bytes.rate
+      disk.device.read.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - disk.device.read.bytes.rate_server_cmaui_4_test_nested4Level
+      vcpus_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - vcpus_server_cmaui_4_test_nested4Level
       network.outpoing.packets_cmaui_port_8_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.outpoing.packets_cmaui_port_8_test_nested4Level
-      cpu_server_cmaui_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - cpu_server_cmaui_test_nested4Level
+      disk.device.write.bytes_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.write.bytes
       feature_cmaui_port_7_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - feature_cmaui_port_7_test_nested4Level
-      cpu_server_cmaui:
-      - server_cmaui
-      - cpu
+      disk.iops_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - disk.iops_server_cmaui_3
       network.incoming.packets.rate_cmaui_port_3:
       - cmaui_port_3
       - network.incoming.packets.rate
+      cpu_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - cpu_server_cmaui_3
       feature_cmaui_port_3:
       - cmaui_port_3
       - feature
+      disk.write.bytes_server_cmaui_2:
+      - server_cmaui_2
+      - disk.write.bytes
       network.incoming.packets.rate_cmaui_port_4:
       - cmaui_port_4
       - network.incoming.packets.rate
+      feature_server_cmaui_2:
+      - server_cmaui_2
+      - feature
       feature_cmaui_port_4:
       - cmaui_port_4
       - feature
       attachment_cmaui_port_6_test_nested3Level:
       - test_nested3Level
       - attachment_cmaui_port_6
-      disk.write.bytes.rate_server_cmaui:
-      - server_cmaui
-      - disk.write.bytes.rate
-      disk.device.write.bytes_server_cmaui_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.device.write.bytes_server_cmaui_test_nested4Level
       network.outgoing.packets.rate_cmaui_port_6_test_nested3Level:
       - test_nested3Level
       - network.outgoing.packets.rate_cmaui_port_6
-      disk.device.read.bytes.rate_server_cmaui:
-      - server_cmaui
-      - disk.device.read.bytes.rate
+      disk.allocation_server_cmaui_2:
+      - server_cmaui_2
+      - disk.allocation
+      disk.device.allocation_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - disk.device.allocation_server_cmaui_4_test_nested4Level
+      binding_server_cmaui_2:
+      - server_cmaui_2
+      - binding
+      vcpus_server_cmaui_2:
+      - server_cmaui_2
+      - vcpus
       network.outgoing.packets.rate_cmaui_port_4:
       - cmaui_port_4
       - network.outgoing.packets.rate
-      disk.write.requests.rate_server_cmaui_test_nested3Level:
+      instance_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - disk.write.requests.rate_server_cmaui
+      - instance_server_cmaui_3
       attachment_cmaui_port_3:
       - cmaui_port_3
       - attachment
-      disk.write.bytes_server_cmaui_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.write.bytes_server_cmaui_test_nested4Level
       attachment_cmaui_port_4:
       - cmaui_port_4
       - attachment
-      disk.iops_server_cmaui_test_nested3Level:
-      - test_nested3Level
-      - disk.iops_server_cmaui
-      host_server_cmaui_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - host_server_cmaui_test_nested4Level
-      disk.device.latency_server_cmaui:
-      - server_cmaui
-      - disk.device.latency
-      disk.read.requests_server_cmaui:
-      - server_cmaui
-      - disk.read.requests
-      disk.device.allocation_server_cmaui_test_nested3Level:
+      scalable_server_cmaui_2:
+      - server_cmaui_2
+      - scalable
+      disk.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - disk.device.allocation_server_cmaui
-      disk.device.read.requests_server_cmaui_test_nested4Level_test_nested3Level:
+      - disk.write.requests.rate_server_cmaui_4_test_nested4Level
+      disk.capacity_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - disk.device.read.requests_server_cmaui_test_nested4Level
-      disk.device.capacity_server_cmaui:
-      - server_cmaui
-      - disk.device.capacity
-      disk.usage_server_cmaui:
-      - server_cmaui
-      - disk.usage
+      - disk.capacity_server_cmaui_4_test_nested4Level
       network.outgoing.packets.rate_cmaui_port_3:
       - cmaui_port_3
       - network.outgoing.packets.rate
-      disk.device.usage_server_cmaui:
-      - server_cmaui
-      - disk.device.usage
-      disk.device.iops_server_cmaui_test_nested3Level:
+      disk.device.read.bytes.rate_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - disk.device.iops_server_cmaui
+      - disk.device.read.bytes.rate_server_cmaui_3
       network.incoming.packets.rate_cmaui_port_5_test_nested3Level:
       - test_nested3Level
       - network.incoming.packets.rate_cmaui_port_5
-      disk.allocation_server_cmaui_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.allocation_server_cmaui_test_nested4Level
-      disk.capacity_server_cmaui:
-      - server_cmaui
-      - disk.capacity
-      disk.write.requests.rate_server_cmaui:
-      - server_cmaui
-      - disk.write.requests.rate
-      os_server_cmaui_test_nested4Level_test_nested3Level:
+      disk.write.requests_server_cmaui_2:
+      - server_cmaui_2
+      - disk.write.requests
+      memory.resident_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - os_server_cmaui_test_nested4Level
+      - memory.resident_server_cmaui_4_test_nested4Level
       network.outpoing.packets_cmaui_port_7_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.outpoing.packets_cmaui_port_7_test_nested4Level
-      disk.device.latency_server_cmaui_test_nested3Level:
+      disk.usage_server_cmaui_2:
+      - server_cmaui_2
+      - disk.usage
+      disk.device.usage_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - disk.device.usage_server_cmaui_3
+      disk.write.bytes_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - disk.write.bytes_server_cmaui_3
+      feature_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - disk.device.latency_server_cmaui
+      - feature_server_cmaui_4_test_nested4Level
       network.incoming.bytes.rate_cmaui_port_8_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.incoming.bytes.rate_cmaui_port_8_test_nested4Level
       binding_cmaui_port_7_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - binding_cmaui_port_7_test_nested4Level
-      disk.root.size_server_cmaui_test_nested4Level_test_nested3Level:
+      disk.write.requests.rate_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - disk.root.size_server_cmaui_test_nested4Level
-      disk.device.read.requests_server_cmaui:
-      - server_cmaui
-      - disk.device.read.requests
+      - disk.write.requests.rate_server_cmaui_3
+      disk.device.read.bytes_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - disk.device.read.bytes_server_cmaui_4_test_nested4Level
+      endpoint_server_cmaui_2:
+      - server_cmaui_2
+      - endpoint
       network.incoming.bytes_cmaui_port_6_test_nested3Level:
       - test_nested3Level
       - network.incoming.bytes_cmaui_port_6
-      memory_server_cmaui:
-      - server_cmaui
-      - memory
-      disk.read.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level:
+      os_server_cmaui_2:
+      - server_cmaui_2
+      - os
+      disk.read.requests_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - disk.read.bytes.rate_server_cmaui_test_nested4Level
-      disk.read.requests_server_cmaui_test_nested3Level:
+      - disk.read.requests_server_cmaui_4_test_nested4Level
+      scalable_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - disk.read.requests_server_cmaui
+      - scalable_server_cmaui_4_test_nested4Level
       network.incoming.packets.rate_cmaui_port_8_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.incoming.packets.rate_cmaui_port_8_test_nested4Level
-      binding_server_cmaui:
-      - server_cmaui
-      - binding
-      disk.device.usage_server_cmaui_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.device.usage_server_cmaui_test_nested4Level
-      disk.device.read.requests.rate_server_cmaui_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.device.read.requests.rate_server_cmaui_test_nested4Level
-      disk.device.write.requests.rate_server_cmaui_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.device.write.requests.rate_server_cmaui_test_nested4Level
       attachment_cmaui_port_5_test_nested3Level:
       - test_nested3Level
       - attachment_cmaui_port_5
-      disk.device.read.requests.rate_server_cmaui:
-      - server_cmaui
-      - disk.device.read.requests.rate
-      feature_server_cmaui_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - feature_server_cmaui_test_nested4Level
-      binding_server_cmaui_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - binding_server_cmaui_test_nested4Level
+      disk.device.allocation_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.allocation
       network.incoming.packets_cmaui_port_7_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.incoming.packets_cmaui_port_7_test_nested4Level
-      disk.read.bytes_server_cmaui_test_nested4Level_test_nested3Level:
+      disk.device.latency_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - disk.read.bytes_server_cmaui_test_nested4Level
-      disk.write.bytes_server_cmaui:
-      - server_cmaui
-      - disk.write.bytes
-      host_server_cmaui_test_nested3Level:
+      - disk.device.latency_server_cmaui_4_test_nested4Level
+      disk.read.bytes_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - disk.read.bytes_server_cmaui_3
+      disk.latency_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - host_server_cmaui
-      scalable_server_cmaui_test_nested4Level_test_nested3Level:
+      - disk.latency_server_cmaui_4_test_nested4Level
+      disk.device.allocation_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - scalable_server_cmaui_test_nested4Level
+      - disk.device.allocation_server_cmaui_3
       network.incoming.bytes.rate_cmaui_port_5_test_nested3Level:
       - test_nested3Level
       - network.incoming.bytes.rate_cmaui_port_5
+      host_server_cmaui_2:
+      - server_cmaui_2
+      - host
+      os_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - os_server_cmaui_3
+      disk.read.bytes_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - disk.read.bytes_server_cmaui_4_test_nested4Level
+      disk.write.requests_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - disk.write.requests_server_cmaui_4_test_nested4Level
       network.incoming.packets_cmaui_port_8_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.incoming.packets_cmaui_port_8_test_nested4Level
+      binding_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - binding_server_cmaui_3
       feature_test_nested3Level:
       - test_nested3Level
       - feature
-      disk.device.write.bytes_server_cmaui_test_nested3Level:
-      - test_nested3Level
-      - disk.device.write.bytes_server_cmaui
       network.outgoing.packets.rate_cmaui_port_8_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.outgoing.packets.rate_cmaui_port_8_test_nested4Level
-      attachment_cmaui_port_8_test_nested4Level_test_nested3Level:
+      cpu_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - attachment_cmaui_port_8_test_nested4Level
-      disk.read.bytes.rate_server_cmaui_test_nested3Level:
+      - cpu_server_cmaui_4_test_nested4Level
+      cpu.delta_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - cpu.delta_server_cmaui_3
+      disk.device.capacity_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - disk.read.bytes.rate_server_cmaui
-      disk.device.write.bytes.rate_server_cmaui_test_nested3Level:
+      - disk.device.capacity_server_cmaui_3
+      disk.device.write.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - disk.device.write.bytes.rate_server_cmaui
-      disk.device.write.requests.rate_server_cmaui_test_nested3Level:
+      - disk.device.write.bytes.rate_server_cmaui_4_test_nested4Level
+      attachment_cmaui_port_8_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - disk.device.write.requests.rate_server_cmaui
-      disk.capacity_server_cmaui_test_nested3Level:
+      - attachment_cmaui_port_8_test_nested4Level
+      scalable_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - disk.capacity_server_cmaui
-      disk.usage_server_cmaui_test_nested4Level_test_nested3Level:
+      - scalable_server_cmaui_3
+      instance_server_cmaui_2:
+      - server_cmaui_2
+      - instance
+      disk.device.iops_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - disk.usage_server_cmaui_test_nested4Level
+      - disk.device.iops_server_cmaui_3
       network.outgoing.bytes.rate_cmaui_port_7_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.outgoing.bytes.rate_cmaui_port_7_test_nested4Level
-      memory.resident_server_cmaui:
-      - server_cmaui
-      - memory.resident
       network.incoming.bytes_cmaui_port_5_test_nested3Level:
       - test_nested3Level
       - network.incoming.bytes_cmaui_port_5
-      disk.device.allocation_server_cmaui_test_nested4Level_test_nested3Level:
+      endpoint_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - endpoint_server_cmaui_3
+      vcpus_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - disk.device.allocation_server_cmaui_test_nested4Level
+      - vcpus_server_cmaui_3
       network.incoming.packets.rate_cmaui_port_7_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.incoming.packets.rate_cmaui_port_7_test_nested4Level
-      disk.write.requests_server_cmaui_test_nested3Level:
+      disk.allocation_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - disk.write.requests_server_cmaui
-      disk.latency_server_cmaui:
-      - server_cmaui
-      - disk.latency
+      - disk.allocation_server_cmaui_4_test_nested4Level
       network.outpoing.packets_cmaui_port_6_test_nested3Level:
       - test_nested3Level
       - network.outpoing.packets_cmaui_port_6
-      vcpus_server_cmaui:
-      - server_cmaui
-      - vcpus
       network.outgoing.bytes_cmaui_port_4:
       - cmaui_port_4
       - network.outgoing.bytes
       network.outgoing.packets.rate_cmaui_port_7_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.outgoing.packets.rate_cmaui_port_7_test_nested4Level
-      disk.device.write.bytes_server_cmaui:
-      - server_cmaui
-      - disk.device.write.bytes
-      instance_server_cmaui_test_nested3Level:
-      - test_nested3Level
-      - instance_server_cmaui
       binding_cmaui_port_5_test_nested3Level:
       - test_nested3Level
       - binding_cmaui_port_5
@@ -667,91 +652,106 @@ topology_template:
       network.incoming.bytes.rate_cmaui_port_4:
       - cmaui_port_4
       - network.incoming.bytes.rate
+      disk.device.write.bytes_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - disk.device.write.bytes_server_cmaui_3
       network.outgoing.bytes_cmaui_port_5_test_nested3Level:
       - test_nested3Level
       - network.outgoing.bytes_cmaui_port_5
-      cpu_util_server_cmaui_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - cpu_util_server_cmaui_test_nested4Level
-      disk.allocation_server_cmaui:
-      - server_cmaui
-      - disk.allocation
-      disk.write.requests_server_cmaui:
-      - server_cmaui
-      - disk.write.requests
-      cpu_server_cmaui_test_nested3Level:
-      - test_nested3Level
-      - cpu_server_cmaui
-      disk.usage_server_cmaui_test_nested3Level:
-      - test_nested3Level
-      - disk.usage_server_cmaui
-      disk.write.bytes_server_cmaui_test_nested3Level:
+      disk.device.read.requests_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.read.requests
+      disk.device.read.requests_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - disk.write.bytes_server_cmaui
+      - disk.device.read.requests_server_cmaui_4_test_nested4Level
+      disk.read.bytes.rate_server_cmaui_2:
+      - server_cmaui_2
+      - disk.read.bytes.rate
       network.outpoing.packets_cmaui_port_3:
       - cmaui_port_3
       - network.outpoing.packets
+      disk.device.write.requests_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - disk.device.write.requests_server_cmaui_4_test_nested4Level
+      disk.capacity_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - disk.capacity_server_cmaui_3
+      cpu.delta_server_cmaui_2:
+      - server_cmaui_2
+      - cpu.delta
+      disk.device.read.requests.rate_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.read.requests.rate
       network.outpoing.packets_cmaui_port_4:
       - cmaui_port_4
       - network.outpoing.packets
+      binding_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - binding_server_cmaui_4_test_nested4Level
       network.incoming.bytes.rate_cmaui_port_7_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.incoming.bytes.rate_cmaui_port_7_test_nested4Level
+      memory.resident_server_cmaui_2:
+      - server_cmaui_2
+      - memory.resident
+      disk.device.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - disk.device.write.requests.rate_server_cmaui_4_test_nested4Level
       binding_cmaui_port_8_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - binding_cmaui_port_8_test_nested4Level
-      scalable_server_cmaui_test_nested3Level:
+      disk.write.bytes_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - scalable_server_cmaui
-      endpoint_server_cmaui:
-      - server_cmaui
-      - endpoint
+      - disk.write.bytes_server_cmaui_4_test_nested4Level
+      disk.device.read.requests_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - disk.device.read.requests_server_cmaui_3
       feature_cmaui_port_5_test_nested3Level:
       - test_nested3Level
       - feature_cmaui_port_5
-      cpu.delta_server_cmaui_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - cpu.delta_server_cmaui_test_nested4Level
       network.incoming.packets_cmaui_port_5_test_nested3Level:
       - test_nested3Level
       - network.incoming.packets_cmaui_port_5
-      disk.device.iops_server_cmaui_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.device.iops_server_cmaui_test_nested4Level
-      disk.write.bytes.rate_server_cmaui_test_nested3Level:
-      - test_nested3Level
-      - disk.write.bytes.rate_server_cmaui
-      disk.device.read.requests.rate_server_cmaui_test_nested3Level:
-      - test_nested3Level
-      - disk.device.read.requests.rate_server_cmaui
-      disk.read.requests_server_cmaui_test_nested4Level_test_nested3Level:
+      disk.latency_server_cmaui_2:
+      - server_cmaui_2
+      - disk.latency
+      disk.ephemeral.size_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - disk.read.requests_server_cmaui_test_nested4Level
+      - disk.ephemeral.size_server_cmaui_3
       network.outgoing.packets.rate_cmaui_port_5_test_nested3Level:
       - test_nested3Level
       - network.outgoing.packets.rate_cmaui_port_5
-      disk.latency_server_cmaui_test_nested4Level_test_nested3Level:
+      disk.device.read.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - disk.device.read.requests.rate_server_cmaui_4_test_nested4Level
+      disk.device.read.bytes_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - disk.device.read.bytes_server_cmaui_3
+      memory.resident_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - disk.latency_server_cmaui_test_nested4Level
+      - memory.resident_server_cmaui_3
+      memory.usage_server_cmaui_2:
+      - server_cmaui_2
+      - memory.usage
     requirements:
       link_cmaui_port_5_test_nested3Level:
       - test_nested3Level
       - link_cmaui_port_5
-      dependency_server_cmaui_test_nested3Level:
+      dependency_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - dependency_server_cmaui_4_test_nested4Level
+      local_storage_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - dependency_server_cmaui
+      - local_storage_server_cmaui_3
       dependency_cmaui_port_6_test_nested3Level:
       - test_nested3Level
       - dependency_cmaui_port_6
-      dependency_server_cmaui:
-      - server_cmaui
-      - dependency
       dependency_cmaui_port_7_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - dependency_cmaui_port_7_test_nested4Level
-      local_storage_server_cmaui_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - local_storage_server_cmaui_test_nested4Level
+      local_storage_server_cmaui_2:
+      - server_cmaui_2
+      - local_storage
       dependency_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - dependency_test_nested4Level
@@ -761,18 +761,18 @@ topology_template:
       link_cmaui_port_3:
       - cmaui_port_3
       - link
-      local_storage_server_cmaui:
-      - server_cmaui
-      - local_storage
-      dependency_server_cmaui_test_nested4Level_test_nested3Level:
+      dependency_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - dependency_server_cmaui_test_nested4Level
+      - dependency_server_cmaui_3
       link_cmaui_port_6_test_nested3Level:
       - test_nested3Level
       - link_cmaui_port_6
       link_cmaui_port_8_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - link_cmaui_port_8_test_nested4Level
+      local_storage_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - local_storage_server_cmaui_4_test_nested4Level
       dependency_test_nested3Level:
       - test_nested3Level
       - dependency
@@ -782,6 +782,9 @@ topology_template:
       dependency_cmaui_port_8_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - dependency_cmaui_port_8_test_nested4Level
+      dependency_server_cmaui_2:
+      - server_cmaui_2
+      - dependency
       dependency_cmaui_port_4:
       - cmaui_port_4
       - dependency
@@ -790,7 +793,4 @@ topology_template:
       - dependency
       dependency_cmaui_port_5_test_nested3Level:
       - test_nested3Level
-      - dependency_cmaui_port_5
-      local_storage_server_cmaui_test_nested3Level:
-      - test_nested3Level
-      - local_storage_server_cmaui
\ No newline at end of file
+      - dependency_cmaui_port_5
\ 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/securityrulestoportconnection/nestedMultiLevels/expectedoutputfiles/nested3ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/nestedMultiLevels/expectedoutputfiles/nested3ServiceTemplate.yaml
index d907a4db05..9bc5ccc78a 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/nestedMultiLevels/expectedoutputfiles/nested3ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/nestedMultiLevels/expectedoutputfiles/nested3ServiceTemplate.yaml
@@ -74,6 +74,19 @@ topology_template:
           substitute_service_template: nested4ServiceTemplate.yaml
         p2:
           get_input: p2
+    server_cmaui_3:
+      type: org.openecomp.resource.vfc.nodes.heat.cmaui
+      properties:
+        flavor:
+          get_input: cmaui_flavor
+        availability_zone:
+          get_input: availability_zone_0
+        image:
+          get_input: cmaui_image
+        name:
+          get_input:
+          - cmaui_names
+          - 0
     cmaui_port_5:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
@@ -99,7 +112,7 @@ topology_template:
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
-          node: server_cmaui
+          node: server_cmaui_3
           relationship: tosca.relationships.network.BindsTo
     cmaui_port_6:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
@@ -126,21 +139,8 @@ topology_template:
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
-          node: server_cmaui
+          node: server_cmaui_3
           relationship: tosca.relationships.network.BindsTo
-    server_cmaui:
-      type: org.openecomp.resource.vfc.nodes.heat.cmaui
-      properties:
-        flavor:
-          get_input: cmaui_flavor
-        availability_zone:
-          get_input: availability_zone_0
-        image:
-          get_input: cmaui_image
-        name:
-          get_input:
-          - cmaui_names
-          - 0
   groups:
     nested3_group:
       type: org.openecomp.groups.heat.HeatStack
@@ -149,135 +149,144 @@ topology_template:
         description: nested3
       members:
       - test_nested4Level
+      - server_cmaui_3
       - cmaui_port_5
       - cmaui_port_6
-      - server_cmaui
   substitution_mappings:
     node_type: org.openecomp.resource.abstract.nodes.heat.nested3
     capabilities:
-      cpu.delta_server_cmaui:
-      - server_cmaui
-      - cpu.delta
-      disk.device.write.requests.rate_server_cmaui:
-      - server_cmaui
-      - disk.device.write.requests.rate
-      disk.device.allocation_server_cmaui:
-      - server_cmaui
-      - disk.device.allocation
-      memory_server_cmaui_test_nested4Level:
+      memory.usage_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - memory_server_cmaui
-      scalable_server_cmaui:
-      - server_cmaui
-      - scalable
-      disk.read.bytes.rate_server_cmaui:
-      - server_cmaui
-      - disk.read.bytes.rate
-      instance_server_cmaui_test_nested4Level:
-      - test_nested4Level
-      - instance_server_cmaui
-      disk.root.size_server_cmaui_test_nested4Level:
+      - memory.usage_server_cmaui_4
+      cpu_util_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.root.size_server_cmaui
-      disk.write.bytes_server_cmaui_test_nested4Level:
-      - test_nested4Level
-      - disk.write.bytes_server_cmaui
-      host_server_cmaui:
-      - server_cmaui
-      - host
-      cpu_util_server_cmaui:
-      - server_cmaui
-      - cpu_util
-      cpu_server_cmaui_test_nested4Level:
+      - cpu_util_server_cmaui_4
+      disk.device.usage_server_cmaui_3:
+      - server_cmaui_3
+      - disk.device.usage
+      disk.device.latency_server_cmaui_3:
+      - server_cmaui_3
+      - disk.device.latency
+      disk.read.requests_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - cpu_server_cmaui
-      vcpus_server_cmaui_test_nested4Level:
+      - disk.read.requests_server_cmaui_4
+      disk.root.size_server_cmaui_3:
+      - server_cmaui_3
+      - disk.root.size
+      disk.device.write.requests.rate_server_cmaui_3:
+      - server_cmaui_3
+      - disk.device.write.requests.rate
+      disk.write.bytes.rate_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - vcpus_server_cmaui
-      disk.device.usage_server_cmaui_test_nested4Level:
+      - disk.write.bytes.rate_server_cmaui_4
+      disk.latency_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.device.usage_server_cmaui
-      disk.device.write.requests_server_cmaui:
-      - server_cmaui
-      - disk.device.write.requests
+      - disk.latency_server_cmaui_4
+      disk.read.requests_server_cmaui_3:
+      - server_cmaui_3
+      - disk.read.requests
+      disk.device.iops_server_cmaui_3:
+      - server_cmaui_3
+      - disk.device.iops
+      disk.device.capacity_server_cmaui_3:
+      - server_cmaui_3
+      - disk.device.capacity
+      disk.device.read.bytes.rate_server_cmaui_3:
+      - server_cmaui_3
+      - disk.device.read.bytes.rate
       network.incoming.bytes.rate_cmaui_port_7_test_nested4Level:
       - test_nested4Level
       - network.incoming.bytes.rate_cmaui_port_7
-      instance_server_cmaui:
-      - server_cmaui
-      - instance
-      disk.latency_server_cmaui_test_nested4Level:
+      feature_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.latency_server_cmaui
-      disk.device.read.bytes_server_cmaui:
-      - server_cmaui
-      - disk.device.read.bytes
-      disk.device.capacity_server_cmaui_test_nested4Level:
+      - feature_server_cmaui_4
+      disk.capacity_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.device.capacity_server_cmaui
+      - disk.capacity_server_cmaui_4
+      disk.read.bytes_server_cmaui_3:
+      - server_cmaui_3
+      - disk.read.bytes
       network.incoming.bytes.rate_cmaui_port_8_test_nested4Level:
       - test_nested4Level
       - network.incoming.bytes.rate_cmaui_port_8
-      disk.root.size_server_cmaui:
-      - server_cmaui
-      - disk.root.size
-      host_server_cmaui_test_nested4Level:
+      disk.device.write.bytes.rate_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - host_server_cmaui
-      os_server_cmaui:
-      - server_cmaui
-      - os
-      disk.device.write.bytes.rate_server_cmaui:
-      - server_cmaui
-      - disk.device.write.bytes.rate
-      disk.device.read.requests.rate_server_cmaui_test_nested4Level:
+      - disk.device.write.bytes.rate_server_cmaui_4
+      disk.device.read.requests_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.device.read.requests.rate_server_cmaui
+      - disk.device.read.requests_server_cmaui_4
+      disk.device.write.requests_server_cmaui_4_test_nested4Level:
+      - test_nested4Level
+      - disk.device.write.requests_server_cmaui_4
+      disk.write.requests.rate_server_cmaui_3:
+      - server_cmaui_3
+      - disk.write.requests.rate
+      disk.device.write.requests.rate_server_cmaui_4_test_nested4Level:
+      - test_nested4Level
+      - disk.device.write.requests.rate_server_cmaui_4
+      disk.device.read.bytes_server_cmaui_4_test_nested4Level:
+      - test_nested4Level
+      - disk.device.read.bytes_server_cmaui_4
+      disk.device.read.bytes_server_cmaui_3:
+      - server_cmaui_3
+      - disk.device.read.bytes
+      memory_server_cmaui_3:
+      - server_cmaui_3
+      - memory
+      memory.resident_server_cmaui_4_test_nested4Level:
+      - test_nested4Level
+      - memory.resident_server_cmaui_4
+      cpu_server_cmaui_3:
+      - server_cmaui_3
+      - cpu
+      binding_server_cmaui_4_test_nested4Level:
+      - test_nested4Level
+      - binding_server_cmaui_4
       network.incoming.packets_cmaui_port_5:
       - cmaui_port_5
       - network.incoming.packets
+      os_server_cmaui_4_test_nested4Level:
+      - test_nested4Level
+      - os_server_cmaui_4
       network.incoming.packets.rate_cmaui_port_7_test_nested4Level:
       - test_nested4Level
       - network.incoming.packets.rate_cmaui_port_7
-      disk.allocation_server_cmaui_test_nested4Level:
+      disk.ephemeral.size_server_cmaui_3:
+      - server_cmaui_3
+      - disk.ephemeral.size
+      cpu.delta_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.allocation_server_cmaui
+      - cpu.delta_server_cmaui_4
       network.incoming.packets_cmaui_port_6:
       - cmaui_port_6
       - network.incoming.packets
-      disk.device.write.bytes.rate_server_cmaui_test_nested4Level:
+      disk.capacity_server_cmaui_3:
+      - server_cmaui_3
+      - disk.capacity
+      disk.device.capacity_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.device.write.bytes.rate_server_cmaui
+      - disk.device.capacity_server_cmaui_4
       network.outgoing.bytes.rate_cmaui_port_7_test_nested4Level:
       - test_nested4Level
       - network.outgoing.bytes.rate_cmaui_port_7
-      disk.device.write.bytes_server_cmaui_test_nested4Level:
-      - test_nested4Level
-      - disk.device.write.bytes_server_cmaui
-      disk.device.write.requests.rate_server_cmaui_test_nested4Level:
+      scalable_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.device.write.requests.rate_server_cmaui
-      disk.device.iops_server_cmaui_test_nested4Level:
+      - scalable_server_cmaui_4
+      disk.device.iops_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.device.iops_server_cmaui
-      disk.read.requests_server_cmaui_test_nested4Level:
+      - disk.device.iops_server_cmaui_4
+      disk.read.bytes.rate_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.read.requests_server_cmaui
-      disk.ephemeral.size_server_cmaui_test_nested4Level:
+      - disk.read.bytes.rate_server_cmaui_4
+      endpoint_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.ephemeral.size_server_cmaui
-      binding_server_cmaui_test_nested4Level:
-      - test_nested4Level
-      - binding_server_cmaui
+      - endpoint_server_cmaui_4
       network.outgoing.bytes_cmaui_port_8_test_nested4Level:
       - test_nested4Level
       - network.outgoing.bytes_cmaui_port_8
-      disk.usage_server_cmaui_test_nested4Level:
+      vcpus_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.usage_server_cmaui
-      feature_server_cmaui:
-      - server_cmaui
-      - feature
+      - vcpus_server_cmaui_4
       binding_cmaui_port_5:
       - cmaui_port_5
       - binding
@@ -287,21 +296,21 @@ topology_template:
       binding_cmaui_port_6:
       - cmaui_port_6
       - binding
+      disk.device.write.requests_server_cmaui_3:
+      - server_cmaui_3
+      - disk.device.write.requests
       network.outgoing.packets.rate_cmaui_port_8_test_nested4Level:
       - test_nested4Level
       - network.outgoing.packets.rate_cmaui_port_8
-      memory.usage_server_cmaui:
-      - server_cmaui
-      - memory.usage
-      disk.ephemeral.size_server_cmaui:
-      - server_cmaui
-      - disk.ephemeral.size
-      feature_server_cmaui_test_nested4Level:
+      disk.write.bytes_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - feature_server_cmaui
-      disk.read.bytes.rate_server_cmaui_test_nested4Level:
+      - disk.write.bytes_server_cmaui_4
+      disk.write.requests.rate_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.read.bytes.rate_server_cmaui
+      - disk.write.requests.rate_server_cmaui_4
+      disk.iops_server_cmaui_3:
+      - server_cmaui_3
+      - disk.iops
       network.outgoing.bytes.rate_cmaui_port_6:
       - cmaui_port_6
       - network.outgoing.bytes.rate
@@ -314,75 +323,78 @@ topology_template:
       network.incoming.bytes_cmaui_port_5:
       - cmaui_port_5
       - network.incoming.bytes
-      disk.iops_server_cmaui:
-      - server_cmaui
-      - disk.iops
-      disk.device.iops_server_cmaui:
-      - server_cmaui
-      - disk.device.iops
-      disk.capacity_server_cmaui_test_nested4Level:
-      - test_nested4Level
-      - disk.capacity_server_cmaui
-      disk.read.bytes_server_cmaui:
-      - server_cmaui
-      - disk.read.bytes
-      scalable_server_cmaui_test_nested4Level:
+      host_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - scalable_server_cmaui
+      - host_server_cmaui_4
+      cpu_util_server_cmaui_3:
+      - server_cmaui_3
+      - cpu_util
+      disk.device.write.bytes.rate_server_cmaui_3:
+      - server_cmaui_3
+      - disk.device.write.bytes.rate
+      disk.write.bytes.rate_server_cmaui_3:
+      - server_cmaui_3
+      - disk.write.bytes.rate
+      disk.device.write.bytes_server_cmaui_3:
+      - server_cmaui_3
+      - disk.device.write.bytes
       network.incoming.bytes_cmaui_port_8_test_nested4Level:
       - test_nested4Level
       - network.incoming.bytes_cmaui_port_8
       network.outpoing.packets_cmaui_port_8_test_nested4Level:
       - test_nested4Level
       - network.outpoing.packets_cmaui_port_8
-      disk.device.read.bytes.rate_server_cmaui_test_nested4Level:
+      disk.iops_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.device.read.bytes.rate_server_cmaui
+      - disk.iops_server_cmaui_4
+      feature_server_cmaui_3:
+      - server_cmaui_3
+      - feature
       feature_cmaui_port_5:
       - cmaui_port_5
       - feature
-      disk.device.allocation_server_cmaui_test_nested4Level:
-      - test_nested4Level
-      - disk.device.allocation_server_cmaui
       feature_cmaui_port_6:
       - cmaui_port_6
       - feature
-      disk.device.write.requests_server_cmaui_test_nested4Level:
-      - test_nested4Level
-      - disk.device.write.requests_server_cmaui
-      cpu_server_cmaui:
-      - server_cmaui
-      - cpu
-      disk.write.bytes.rate_server_cmaui_test_nested4Level:
+      cpu_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.write.bytes.rate_server_cmaui
+      - cpu_server_cmaui_4
       attachment_cmaui_port_7_test_nested4Level:
       - test_nested4Level
       - attachment_cmaui_port_7
-      disk.write.requests.rate_server_cmaui_test_nested4Level:
-      - test_nested4Level
-      - disk.write.requests.rate_server_cmaui
       binding_cmaui_port_8_test_nested4Level:
       - test_nested4Level
       - binding_cmaui_port_8
+      disk.write.bytes_server_cmaui_3:
+      - server_cmaui_3
+      - disk.write.bytes
       network.incoming.packets.rate_cmaui_port_5:
       - cmaui_port_5
       - network.incoming.packets.rate
-      disk.write.bytes.rate_server_cmaui:
-      - server_cmaui
-      - disk.write.bytes.rate
-      disk.device.read.bytes.rate_server_cmaui:
-      - server_cmaui
-      - disk.device.read.bytes.rate
+      disk.allocation_server_cmaui_3:
+      - server_cmaui_3
+      - disk.allocation
       attachment_cmaui_port_6:
       - cmaui_port_6
       - attachment
+      binding_server_cmaui_3:
+      - server_cmaui_3
+      - binding
+      vcpus_server_cmaui_3:
+      - server_cmaui_3
+      - vcpus
       network.outgoing.packets.rate_cmaui_port_7_test_nested4Level:
       - test_nested4Level
       - network.outgoing.packets.rate_cmaui_port_7
+      instance_server_cmaui_4_test_nested4Level:
+      - test_nested4Level
+      - instance_server_cmaui_4
       network.outgoing.packets.rate_cmaui_port_5:
       - cmaui_port_5
       - network.outgoing.packets.rate
+      scalable_server_cmaui_3:
+      - server_cmaui_3
+      - scalable
       network.outgoing.packets.rate_cmaui_port_6:
       - cmaui_port_6
       - network.outgoing.packets.rate
@@ -392,166 +404,154 @@ topology_template:
       feature_cmaui_port_8_test_nested4Level:
       - test_nested4Level
       - feature_cmaui_port_8
-      disk.device.latency_server_cmaui:
-      - server_cmaui
-      - disk.device.latency
-      disk.read.requests_server_cmaui:
-      - server_cmaui
-      - disk.read.requests
-      disk.device.capacity_server_cmaui:
-      - server_cmaui
-      - disk.device.capacity
-      disk.usage_server_cmaui:
-      - server_cmaui
-      - disk.usage
-      disk.device.usage_server_cmaui:
-      - server_cmaui
-      - disk.device.usage
+      disk.write.requests_server_cmaui_3:
+      - server_cmaui_3
+      - disk.write.requests
       network.outpoing.packets_cmaui_port_7_test_nested4Level:
       - test_nested4Level
       - network.outpoing.packets_cmaui_port_7
-      disk.capacity_server_cmaui:
-      - server_cmaui
-      - disk.capacity
-      disk.write.requests.rate_server_cmaui:
-      - server_cmaui
-      - disk.write.requests.rate
       attachment_cmaui_port_8_test_nested4Level:
       - test_nested4Level
       - attachment_cmaui_port_8
+      disk.usage_server_cmaui_3:
+      - server_cmaui_3
+      - disk.usage
+      disk.device.write.bytes_server_cmaui_4_test_nested4Level:
+      - test_nested4Level
+      - disk.device.write.bytes_server_cmaui_4
       network.outgoing.bytes.rate_cmaui_port_8_test_nested4Level:
       - test_nested4Level
       - network.outgoing.bytes.rate_cmaui_port_8
-      disk.iops_server_cmaui_test_nested4Level:
-      - test_nested4Level
-      - disk.iops_server_cmaui
-      disk.device.read.requests_server_cmaui:
-      - server_cmaui
-      - disk.device.read.requests
       feature_cmaui_port_7_test_nested4Level:
       - test_nested4Level
       - feature_cmaui_port_7
-      endpoint_server_cmaui_test_nested4Level:
+      endpoint_server_cmaui_3:
+      - server_cmaui_3
+      - endpoint
+      memory_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - endpoint_server_cmaui
+      - memory_server_cmaui_4
       network.incoming.packets.rate_cmaui_port_6:
       - cmaui_port_6
       - network.incoming.packets.rate
-      memory_server_cmaui:
-      - server_cmaui
-      - memory
-      cpu.delta_server_cmaui_test_nested4Level:
-      - test_nested4Level
-      - cpu.delta_server_cmaui
-      memory.resident_server_cmaui_test_nested4Level:
+      os_server_cmaui_3:
+      - server_cmaui_3
+      - os
+      disk.root.size_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - memory.resident_server_cmaui
+      - disk.root.size_server_cmaui_4
       binding_cmaui_port_7_test_nested4Level:
       - test_nested4Level
       - binding_cmaui_port_7
-      binding_server_cmaui:
-      - server_cmaui
-      - binding
-      disk.device.read.requests.rate_server_cmaui:
-      - server_cmaui
-      - disk.device.read.requests.rate
-      disk.write.bytes_server_cmaui:
-      - server_cmaui
-      - disk.write.bytes
-      network.outgoing.bytes_cmaui_port_7_test_nested4Level:
+      disk.usage_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - network.outgoing.bytes_cmaui_port_7
-      disk.read.bytes_server_cmaui_test_nested4Level:
+      - disk.usage_server_cmaui_4
+      disk.device.latency_server_cmaui_4_test_nested4Level:
+      - test_nested4Level
+      - disk.device.latency_server_cmaui_4
+      disk.device.read.requests.rate_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.read.bytes_server_cmaui
-      disk.device.read.requests_server_cmaui_test_nested4Level:
+      - disk.device.read.requests.rate_server_cmaui_4
+      disk.ephemeral.size_server_cmaui_4_test_nested4Level:
+      - test_nested4Level
+      - disk.ephemeral.size_server_cmaui_4
+      disk.device.allocation_server_cmaui_3:
+      - server_cmaui_3
+      - disk.device.allocation
+      disk.read.bytes_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.device.read.requests_server_cmaui
-      disk.write.requests_server_cmaui_test_nested4Level:
+      - disk.read.bytes_server_cmaui_4
+      disk.allocation_server_cmaui_4_test_nested4Level:
+      - test_nested4Level
+      - disk.allocation_server_cmaui_4
+      network.outgoing.bytes_cmaui_port_7_test_nested4Level:
+      - test_nested4Level
+      - network.outgoing.bytes_cmaui_port_7
+      disk.device.allocation_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.write.requests_server_cmaui
-      disk.device.latency_server_cmaui_test_nested4Level:
+      - disk.device.allocation_server_cmaui_4
+      host_server_cmaui_3:
+      - server_cmaui_3
+      - host
+      disk.write.requests_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.device.latency_server_cmaui
+      - disk.write.requests_server_cmaui_4
       network.incoming.packets_cmaui_port_7_test_nested4Level:
       - test_nested4Level
       - network.incoming.packets_cmaui_port_7
       feature_test_nested4Level:
       - test_nested4Level
       - feature
-      os_server_cmaui_test_nested4Level:
-      - test_nested4Level
-      - os_server_cmaui
       network.incoming.bytes.rate_cmaui_port_6:
       - cmaui_port_6
       - network.incoming.bytes.rate
-      memory.resident_server_cmaui:
-      - server_cmaui
-      - memory.resident
+      instance_server_cmaui_3:
+      - server_cmaui_3
+      - instance
       network.incoming.packets.rate_cmaui_port_8_test_nested4Level:
       - test_nested4Level
       - network.incoming.packets.rate_cmaui_port_8
-      memory.usage_server_cmaui_test_nested4Level:
-      - test_nested4Level
-      - memory.usage_server_cmaui
       network.outpoing.packets_cmaui_port_5:
       - cmaui_port_5
       - network.outpoing.packets
-      disk.latency_server_cmaui:
-      - server_cmaui
-      - disk.latency
       network.outgoing.bytes_cmaui_port_6:
       - cmaui_port_6
       - network.outgoing.bytes
       network.outpoing.packets_cmaui_port_6:
       - cmaui_port_6
       - network.outpoing.packets
+      disk.read.bytes.rate_server_cmaui_3:
+      - server_cmaui_3
+      - disk.read.bytes.rate
       network.outgoing.bytes_cmaui_port_5:
       - cmaui_port_5
       - network.outgoing.bytes
-      vcpus_server_cmaui:
-      - server_cmaui
-      - vcpus
-      disk.device.write.bytes_server_cmaui:
-      - server_cmaui
-      - disk.device.write.bytes
-      disk.device.read.bytes_server_cmaui_test_nested4Level:
+      disk.device.usage_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.device.read.bytes_server_cmaui
-      cpu_util_server_cmaui_test_nested4Level:
+      - disk.device.usage_server_cmaui_4
+      disk.device.read.bytes.rate_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - cpu_util_server_cmaui
+      - disk.device.read.bytes.rate_server_cmaui_4
       network.incoming.bytes.rate_cmaui_port_5:
       - cmaui_port_5
       - network.incoming.bytes.rate
-      disk.allocation_server_cmaui:
-      - server_cmaui
-      - disk.allocation
-      disk.write.requests_server_cmaui:
-      - server_cmaui
-      - disk.write.requests
+      disk.device.read.requests_server_cmaui_3:
+      - server_cmaui_3
+      - disk.device.read.requests
       network.incoming.bytes_cmaui_port_7_test_nested4Level:
       - test_nested4Level
       - network.incoming.bytes_cmaui_port_7
-      endpoint_server_cmaui:
-      - server_cmaui
-      - endpoint
+      disk.device.read.requests.rate_server_cmaui_3:
+      - server_cmaui_3
+      - disk.device.read.requests.rate
+      cpu.delta_server_cmaui_3:
+      - server_cmaui_3
+      - cpu.delta
+      memory.resident_server_cmaui_3:
+      - server_cmaui_3
+      - memory.resident
+      disk.latency_server_cmaui_3:
+      - server_cmaui_3
+      - disk.latency
+      memory.usage_server_cmaui_3:
+      - server_cmaui_3
+      - memory.usage
     requirements:
       dependency_cmaui_port_7_test_nested4Level:
       - test_nested4Level
       - dependency_cmaui_port_7
+      local_storage_server_cmaui_4_test_nested4Level:
+      - test_nested4Level
+      - local_storage_server_cmaui_4
       dependency_cmaui_port_6:
       - cmaui_port_6
       - dependency
-      dependency_server_cmaui:
-      - server_cmaui
-      - dependency
       dependency_cmaui_port_8_test_nested4Level:
       - test_nested4Level
       - dependency_cmaui_port_8
-      local_storage_server_cmaui_test_nested4Level:
-      - test_nested4Level
-      - local_storage_server_cmaui
+      local_storage_server_cmaui_3:
+      - server_cmaui_3
+      - local_storage
       link_cmaui_port_6:
       - cmaui_port_6
       - link
@@ -564,15 +564,15 @@ topology_template:
       link_cmaui_port_8_test_nested4Level:
       - test_nested4Level
       - link_cmaui_port_8
-      local_storage_server_cmaui:
-      - server_cmaui
-      - local_storage
-      dependency_server_cmaui_test_nested4Level:
-      - test_nested4Level
-      - dependency_server_cmaui
       link_cmaui_port_7_test_nested4Level:
       - test_nested4Level
       - link_cmaui_port_7
+      dependency_server_cmaui_4_test_nested4Level:
+      - test_nested4Level
+      - dependency_server_cmaui_4
+      dependency_server_cmaui_3:
+      - server_cmaui_3
+      - dependency
       dependency_cmaui_port_5:
       - cmaui_port_5
       - 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/securityrulestoportconnection/nestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/nestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.yaml
index 720662bde6..c5b92cbd65 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/nestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/nestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.yaml
@@ -84,8 +84,21 @@ topology_template:
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
-          node: server_cmaui
+          node: server_cmaui_4
           relationship: tosca.relationships.network.BindsTo
+    server_cmaui_4:
+      type: org.openecomp.resource.vfc.nodes.heat.cmaui
+      properties:
+        flavor:
+          get_input: cmaui_flavor
+        availability_zone:
+          get_input: availability_zone_0
+        image:
+          get_input: cmaui_image
+        name:
+          get_input:
+          - cmaui_names
+          - 0
     cmaui_port_8:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
@@ -112,21 +125,8 @@ topology_template:
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
-          node: server_cmaui
+          node: server_cmaui_4
           relationship: tosca.relationships.network.BindsTo
-    server_cmaui:
-      type: org.openecomp.resource.vfc.nodes.heat.cmaui
-      properties:
-        flavor:
-          get_input: cmaui_flavor
-        availability_zone:
-          get_input: availability_zone_0
-        image:
-          get_input: cmaui_image
-        name:
-          get_input:
-          - cmaui_names
-          - 0
   groups:
     nested4_group:
       type: org.openecomp.groups.heat.HeatStack
@@ -135,119 +135,119 @@ topology_template:
         description: nested4
       members:
       - cmaui_port_7
+      - server_cmaui_4
       - cmaui_port_8
-      - server_cmaui
   substitution_mappings:
     node_type: org.openecomp.resource.abstract.nodes.heat.nested4
     capabilities:
-      cpu.delta_server_cmaui:
-      - server_cmaui
-      - cpu.delta
-      disk.device.write.requests.rate_server_cmaui:
-      - server_cmaui
-      - disk.device.write.requests.rate
-      disk.device.allocation_server_cmaui:
-      - server_cmaui
-      - disk.device.allocation
+      disk.write.bytes_server_cmaui_4:
+      - server_cmaui_4
+      - disk.write.bytes
+      disk.device.write.bytes_server_cmaui_4:
+      - server_cmaui_4
+      - disk.device.write.bytes
+      feature_server_cmaui_4:
+      - server_cmaui_4
+      - feature
+      disk.device.latency_server_cmaui_4:
+      - server_cmaui_4
+      - disk.device.latency
+      disk.device.usage_server_cmaui_4:
+      - server_cmaui_4
+      - disk.device.usage
       feature_cmaui_port_7:
       - cmaui_port_7
       - feature
       feature_cmaui_port_8:
       - cmaui_port_8
       - feature
-      scalable_server_cmaui:
-      - server_cmaui
-      - scalable
-      disk.read.bytes.rate_server_cmaui:
-      - server_cmaui
-      - disk.read.bytes.rate
-      cpu_server_cmaui:
-      - server_cmaui
-      - cpu
-      disk.write.bytes.rate_server_cmaui:
-      - server_cmaui
-      - disk.write.bytes.rate
-      disk.device.read.bytes.rate_server_cmaui:
-      - server_cmaui
-      - disk.device.read.bytes.rate
-      host_server_cmaui:
-      - server_cmaui
-      - host
-      cpu_util_server_cmaui:
-      - server_cmaui
-      - cpu_util
+      disk.read.requests_server_cmaui_4:
+      - server_cmaui_4
+      - disk.read.requests
+      disk.allocation_server_cmaui_4:
+      - server_cmaui_4
+      - disk.allocation
       network.outgoing.packets.rate_cmaui_port_8:
       - cmaui_port_8
       - network.outgoing.packets.rate
       attachment_cmaui_port_7:
       - cmaui_port_7
       - attachment
+      vcpus_server_cmaui_4:
+      - server_cmaui_4
+      - vcpus
+      binding_server_cmaui_4:
+      - server_cmaui_4
+      - binding
+      disk.root.size_server_cmaui_4:
+      - server_cmaui_4
+      - disk.root.size
+      disk.device.write.requests.rate_server_cmaui_4:
+      - server_cmaui_4
+      - disk.device.write.requests.rate
       attachment_cmaui_port_8:
       - cmaui_port_8
       - attachment
+      scalable_server_cmaui_4:
+      - server_cmaui_4
+      - scalable
       network.outgoing.packets.rate_cmaui_port_7:
       - cmaui_port_7
       - network.outgoing.packets.rate
-      disk.device.latency_server_cmaui:
-      - server_cmaui
-      - disk.device.latency
-      disk.device.write.requests_server_cmaui:
-      - server_cmaui
-      - disk.device.write.requests
-      disk.read.requests_server_cmaui:
-      - server_cmaui
-      - disk.read.requests
-      disk.device.capacity_server_cmaui:
-      - server_cmaui
-      - disk.device.capacity
-      disk.usage_server_cmaui:
-      - server_cmaui
+      disk.write.requests_server_cmaui_4:
+      - server_cmaui_4
+      - disk.write.requests
+      disk.usage_server_cmaui_4:
+      - server_cmaui_4
       - disk.usage
-      disk.device.usage_server_cmaui:
-      - server_cmaui
-      - disk.device.usage
-      disk.capacity_server_cmaui:
-      - server_cmaui
-      - disk.capacity
-      disk.write.requests.rate_server_cmaui:
-      - server_cmaui
-      - disk.write.requests.rate
-      disk.device.read.requests_server_cmaui:
-      - server_cmaui
-      - disk.device.read.requests
-      instance_server_cmaui:
-      - server_cmaui
-      - instance
-      disk.device.read.bytes_server_cmaui:
-      - server_cmaui
-      - disk.device.read.bytes
+      disk.device.capacity_server_cmaui_4:
+      - server_cmaui_4
+      - disk.device.capacity
+      disk.device.iops_server_cmaui_4:
+      - server_cmaui_4
+      - disk.device.iops
+      disk.device.read.bytes.rate_server_cmaui_4:
+      - server_cmaui_4
+      - disk.device.read.bytes.rate
+      endpoint_server_cmaui_4:
+      - server_cmaui_4
+      - endpoint
+      disk.read.bytes_server_cmaui_4:
+      - server_cmaui_4
+      - disk.read.bytes
       network.incoming.packets.rate_cmaui_port_7:
       - cmaui_port_7
       - network.incoming.packets.rate
-      memory_server_cmaui:
-      - server_cmaui
-      - memory
+      os_server_cmaui_4:
+      - server_cmaui_4
+      - os
       network.incoming.packets.rate_cmaui_port_8:
       - cmaui_port_8
       - network.incoming.packets.rate
-      disk.root.size_server_cmaui:
-      - server_cmaui
-      - disk.root.size
-      binding_server_cmaui:
-      - server_cmaui
-      - binding
-      disk.device.read.requests.rate_server_cmaui:
-      - server_cmaui
-      - disk.device.read.requests.rate
-      disk.write.bytes_server_cmaui:
-      - server_cmaui
-      - disk.write.bytes
-      os_server_cmaui:
-      - server_cmaui
-      - os
-      disk.device.write.bytes.rate_server_cmaui:
-      - server_cmaui
-      - disk.device.write.bytes.rate
+      disk.device.allocation_server_cmaui_4:
+      - server_cmaui_4
+      - disk.device.allocation
+      disk.write.requests.rate_server_cmaui_4:
+      - server_cmaui_4
+      - disk.write.requests.rate
+      disk.device.read.bytes_server_cmaui_4:
+      - server_cmaui_4
+      - disk.device.read.bytes
+      memory_server_cmaui_4:
+      - server_cmaui_4
+      - memory
+      disk.write.bytes.rate_server_cmaui_4:
+      - server_cmaui_4
+      - disk.write.bytes.rate
+      cpu_server_cmaui_4:
+      - server_cmaui_4
+      - cpu
+      disk.capacity_server_cmaui_4:
+      - server_cmaui_4
+      - disk.capacity
+      host_server_cmaui_4:
+      - server_cmaui_4
+      - host
       network.incoming.packets_cmaui_port_7:
       - cmaui_port_7
       - network.incoming.packets
@@ -257,53 +257,53 @@ topology_template:
       network.incoming.bytes.rate_cmaui_port_7:
       - cmaui_port_7
       - network.incoming.bytes.rate
+      instance_server_cmaui_4:
+      - server_cmaui_4
+      - instance
       network.incoming.bytes.rate_cmaui_port_8:
       - cmaui_port_8
       - network.incoming.bytes.rate
-      memory.resident_server_cmaui:
-      - server_cmaui
-      - memory.resident
       network.outgoing.bytes_cmaui_port_7:
       - cmaui_port_7
       - network.outgoing.bytes
-      disk.latency_server_cmaui:
-      - server_cmaui
-      - disk.latency
-      feature_server_cmaui:
-      - server_cmaui
-      - feature
       network.outpoing.packets_cmaui_port_7:
       - cmaui_port_7
       - network.outpoing.packets
-      vcpus_server_cmaui:
-      - server_cmaui
-      - vcpus
+      disk.read.bytes.rate_server_cmaui_4:
+      - server_cmaui_4
+      - disk.read.bytes.rate
       network.outpoing.packets_cmaui_port_8:
       - cmaui_port_8
       - network.outpoing.packets
-      disk.device.write.bytes_server_cmaui:
-      - server_cmaui
-      - disk.device.write.bytes
+      disk.device.write.requests_server_cmaui_4:
+      - server_cmaui_4
+      - disk.device.write.requests
       binding_cmaui_port_7:
       - cmaui_port_7
       - binding
       network.outgoing.bytes_cmaui_port_8:
       - cmaui_port_8
       - network.outgoing.bytes
+      disk.device.read.requests_server_cmaui_4:
+      - server_cmaui_4
+      - disk.device.read.requests
       binding_cmaui_port_8:
       - cmaui_port_8
       - binding
-      disk.allocation_server_cmaui:
-      - server_cmaui
-      - disk.allocation
-      disk.write.requests_server_cmaui:
-      - server_cmaui
-      - disk.write.requests
-      memory.usage_server_cmaui:
-      - server_cmaui
-      - memory.usage
-      disk.ephemeral.size_server_cmaui:
-      - server_cmaui
+      disk.iops_server_cmaui_4:
+      - server_cmaui_4
+      - disk.iops
+      disk.device.read.requests.rate_server_cmaui_4:
+      - server_cmaui_4
+      - disk.device.read.requests.rate
+      cpu.delta_server_cmaui_4:
+      - server_cmaui_4
+      - cpu.delta
+      memory.resident_server_cmaui_4:
+      - server_cmaui_4
+      - memory.resident
+      disk.ephemeral.size_server_cmaui_4:
+      - server_cmaui_4
       - disk.ephemeral.size
       network.outgoing.bytes.rate_cmaui_port_7:
       - cmaui_port_7
@@ -311,24 +311,24 @@ topology_template:
       network.incoming.bytes_cmaui_port_8:
       - cmaui_port_8
       - network.incoming.bytes
-      endpoint_server_cmaui:
-      - server_cmaui
-      - endpoint
       network.incoming.bytes_cmaui_port_7:
       - cmaui_port_7
       - network.incoming.bytes
-      disk.iops_server_cmaui:
-      - server_cmaui
-      - disk.iops
+      disk.latency_server_cmaui_4:
+      - server_cmaui_4
+      - disk.latency
       network.outgoing.bytes.rate_cmaui_port_8:
       - cmaui_port_8
       - network.outgoing.bytes.rate
-      disk.device.iops_server_cmaui:
-      - server_cmaui
-      - disk.device.iops
-      disk.read.bytes_server_cmaui:
-      - server_cmaui
-      - disk.read.bytes
+      disk.device.write.bytes.rate_server_cmaui_4:
+      - server_cmaui_4
+      - disk.device.write.bytes.rate
+      memory.usage_server_cmaui_4:
+      - server_cmaui_4
+      - memory.usage
+      cpu_util_server_cmaui_4:
+      - server_cmaui_4
+      - cpu_util
     requirements:
       dependency_cmaui_port_8:
       - cmaui_port_8
@@ -342,9 +342,9 @@ topology_template:
       link_cmaui_port_7:
       - cmaui_port_7
       - link
-      dependency_server_cmaui:
-      - server_cmaui
+      dependency_server_cmaui_4:
+      - server_cmaui_4
       - dependency
-      local_storage_server_cmaui:
-      - server_cmaui
+      local_storage_server_cmaui_4:
+      - server_cmaui_4
       - local_storage
\ 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/securityrulestoportconnection/nestedMultiLevels/inputfiles/nested1.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/nestedMultiLevels/inputfiles/nested1.yml
index c73fcf63d7..d59f16ed06 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/nestedMultiLevels/inputfiles/nested1.yml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/nestedMultiLevels/inputfiles/nested1.yml
@@ -47,7 +47,7 @@ resources:
       security_groups: [{get_param: p2}]
       replacement_policy: AUTO
 
-  server_cmaui:
+  server_cmaui_1:
     type: OS::Nova::Server
     properties:
       name: { get_param: [cmaui_names, 0]}
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/nestedMultiLevels/inputfiles/nested2.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/nestedMultiLevels/inputfiles/nested2.yml
index b4655fa35d..dca4585db3 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/nestedMultiLevels/inputfiles/nested2.yml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/nestedMultiLevels/inputfiles/nested2.yml
@@ -47,7 +47,7 @@ resources:
       security_groups: [{get_param: p1}]
       replacement_policy: AUTO
 
-  server_cmaui:
+  server_cmaui_2:
     type: OS::Nova::Server
     properties:
       name: { get_param: [cmaui_names, 0]}
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/nestedMultiLevels/inputfiles/nested3.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/nestedMultiLevels/inputfiles/nested3.yml
index 55538833a4..157b085924 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/nestedMultiLevels/inputfiles/nested3.yml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/nestedMultiLevels/inputfiles/nested3.yml
@@ -48,7 +48,7 @@ resources:
       security_groups: [{get_param: p2}]
       replacement_policy: AUTO
 
-  server_cmaui:
+  server_cmaui_3:
     type: OS::Nova::Server
     properties:
       name: { get_param: [cmaui_names, 0]}
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/nestedMultiLevels/inputfiles/nested4.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/nestedMultiLevels/inputfiles/nested4.yml
index ce3ffb76a8..0e689efa6a 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/nestedMultiLevels/inputfiles/nested4.yml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/nestedMultiLevels/inputfiles/nested4.yml
@@ -46,7 +46,7 @@ resources:
       security_groups: [{get_param: p2},{get_param: p2}]
       replacement_policy: AUTO
 
-  server_cmaui:
+  server_cmaui_4:
     type: OS::Nova::Server
     properties:
       name: { get_param: [cmaui_names, 0]}
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/inputfiles/FEAdd_On_Module_QRouterTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/inputfiles/FEAdd_On_Module_QRouterTemplate.yaml
index 758276fe18..1782edf72a 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/inputfiles/FEAdd_On_Module_QRouterTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/inputfiles/FEAdd_On_Module_QRouterTemplate.yaml
@@ -74,7 +74,7 @@ resources:
       metadata:
         cdr_network_ip_0:
           get_attr:
-          - cdr_network_port
+          - cdr_network_port_1
           - fixed_ip_0s
           - 0
           - ip_address
@@ -121,7 +121,7 @@ resources:
       - port:
           get_resource: oam_private_net_network_port
       - port:
-          get_resource: cdr_network_port
+          get_resource: cdr_network_port_1
       personality:
         /root/CheckAvailability/check_availability.py:
           get_file: check_availability.py
@@ -152,7 +152,7 @@ resources:
             get_file: FEAdd_On_Module_QRouterCloudConfig
       user_data_format: RAW
     type: OS::Nova::Server
-  cdr_network_port:
+  cdr_network_port_1:
     properties:
       network:
         get_param: cdr_network
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/inputfiles/FEAdd_On_Module_vLBAgentTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/inputfiles/FEAdd_On_Module_vLBAgentTemplate.yaml
index 80a65d17fc..4c7f0f2e44 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/inputfiles/FEAdd_On_Module_vLBAgentTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/inputfiles/FEAdd_On_Module_vLBAgentTemplate.yaml
@@ -72,7 +72,7 @@ parameters:
   vnf_id:
     type: string
 resources:
-  oam_private_net_network_port:
+  oam_private_net_network_port_3:
     properties:
       network:
         get_param: oam_private_net_name
@@ -86,7 +86,7 @@ resources:
       security_groups:
       - get_param: security_group
     type: OS::Neutron::Port
-  packet_mirror_network_port:
+  packet_mirror_network_port_1:
     properties:
       network:
         get_param: packet_mirror_network
@@ -123,13 +123,13 @@ resources:
           get_param: ntp_timezone
         oam_private_network_cidr:
           get_attr:
-          - oam_private_net_network_port
+          - oam_private_net_network_port_3
           - subnets
           - 0
           - cidr
         oam_private_network_ip_0:
           get_attr:
-          - oam_private_net_network_port
+          - oam_private_net_network_port_3
           - fixed_ip_0s
           - 0
           - ip_address
@@ -147,13 +147,13 @@ resources:
           - ip_address
         packet_mirror_network_cidr:
           get_attr:
-          - packet_mirror_network_port
+          - packet_mirror_network_port_1
           - subnets
           - 0
           - cidr
         packet_mirror_network_ip_0:
           get_attr:
-          - packet_mirror_network_port
+          - packet_mirror_network_port_1
           - fixed_ip_0s
           - 0
           - ip_address
@@ -193,9 +193,9 @@ resources:
         - get_param: vLBAgent_index
       networks:
       - port:
-          get_resource: oam_private_net_network_port
+          get_resource: oam_private_net_network_port_3
       - port:
-          get_resource: packet_mirror_network_port
+          get_resource: packet_mirror_network_port_1
       - port:
           get_resource: packet_internal_network_port
       personality:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/inputfiles/FEAdd_On_Module_vLBTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/inputfiles/FEAdd_On_Module_vLBTemplate.yaml
index afc435adaf..ad3a156bbf 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/inputfiles/FEAdd_On_Module_vLBTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/inputfiles/FEAdd_On_Module_vLBTemplate.yaml
@@ -68,14 +68,14 @@ parameters:
   vnf_id:
     type: string
 resources:
-  oam_private_net_network_port:
+  oam_private_net_network_port_2:
     properties:
       network:
         get_param: oam_private_net_name
       security_groups:
       - get_param: security_group
     type: OS::Neutron::Port
-  packet_internal_network_port:
+  packet_internal_network_port_2:
     properties:
       network:
         get_param: packet_internal_network
@@ -119,25 +119,25 @@ resources:
           get_param: ntp_timezone
         oam_private_network_cidr:
           get_attr:
-          - oam_private_net_network_port
+          - oam_private_net_network_port_2
           - subnets
           - 0
           - cidr
         oam_private_network_ip_0:
           get_attr:
-          - oam_private_net_network_port
+          - oam_private_net_network_port_2
           - fixed_ip_0s
           - 0
           - ip_address
         packet_internal_network_cidr:
           get_attr:
-          - packet_internal_network_port
+          - packet_internal_network_port_2
           - subnets
           - 0
           - cidr
         packet_internal_network_ip_0:
           get_attr:
-          - packet_internal_network_port
+          - packet_internal_network_port_2
           - fixed_ip_0s
           - 0
           - ip_address
@@ -187,11 +187,11 @@ resources:
         - get_param: vLB_index
       networks:
       - port:
-          get_resource: oam_private_net_network_port
+          get_resource: oam_private_net_network_port_2
       - port:
           get_resource: packet_mirror_network_port
       - port:
-          get_resource: packet_internal_network_port
+          get_resource: packet_internal_network_port_2
       personality:
         /root/CheckAvailability/check_availability.py:
           get_file: check_availability.py
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/inputfiles/FEAdd_On_Module_vProbeTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/inputfiles/FEAdd_On_Module_vProbeTemplate.yaml
index d343ee5595..e294a34d3a 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/inputfiles/FEAdd_On_Module_vProbeTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/inputfiles/FEAdd_On_Module_vProbeTemplate.yaml
@@ -122,25 +122,25 @@ resources:
           get_param: ntp_timezone
         oam_private_network_cidr:
           get_attr:
-          - oam_private_net_network_port
+          - oam_private_net_network_port_1
           - subnets
           - 0
           - cidr
         oam_private_network_ip_0:
           get_attr:
-          - oam_private_net_network_port
+          - oam_private_net_network_port_1
           - fixed_ip_0s
           - 0
           - ip_address
         packet_internal_network_cidr:
           get_attr:
-          - packet_internal_network_port
+          - packet_internal_network_port_1
           - subnets
           - 0
           - cidr
         packet_internal_network_ip_0:
           get_attr:
-          - packet_internal_network_port
+          - packet_internal_network_port_1
           - fixed_ip_0s
           - 0
           - ip_address
@@ -177,11 +177,11 @@ resources:
         - get_param: vprobe_index
       networks:
       - port:
-          get_resource: oam_private_net_network_port
+          get_resource: oam_private_net_network_port_1
       - port:
           get_resource: cdr_network_port
       - port:
-          get_resource: packet_internal_network_port
+          get_resource: packet_internal_network_port_1
       personality:
         /root/CheckAvailability/check_availability.py:
           get_file: check_availability.py
@@ -239,14 +239,14 @@ resources:
       security_groups:
       - get_param: security_group
     type: OS::Neutron::Port
-  oam_private_net_network_port:
+  oam_private_net_network_port_1:
     properties:
       network:
         get_param: oam_private_net_name
       security_groups:
       - get_param: security_group
     type: OS::Neutron::Port
-  packet_internal_network_port:
+  packet_internal_network_port_1:
     properties:
       network:
         get_param: packet_internal_network
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/FEAdd_On_Module_QRouterTemplateServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/FEAdd_On_Module_QRouterTemplateServiceTemplate.yaml
index ca861cbfc0..9ca9550e5a 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/FEAdd_On_Module_QRouterTemplateServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/FEAdd_On_Module_QRouterTemplateServiceTemplate.yaml
@@ -134,23 +134,7 @@ topology_template:
       immutable: false
       type: string
   node_templates:
-    qrouter_volume_1:
-      type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume
-      properties:
-        volume_type:
-          get_input: qrouter_volume_type_1
-        size: '(get_input : qrouter_volume_size_1) * 1024'
-        description:
-          get_input: qrouter_volume_name_1
-    qrouter_volume_0:
-      type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume
-      properties:
-        volume_type:
-          get_input: qrouter_volume_type_0
-        size: '(get_input : qrouter_volume_size_0) * 1024'
-        description:
-          get_input: qrouter_volume_name_0
-    cdr_network_port:
+    cdr_network_port_1:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         ip_requirements:
@@ -171,6 +155,22 @@ topology_template:
           capability: tosca.capabilities.network.Bindable
           node: QRouter1
           relationship: tosca.relationships.network.BindsTo
+    qrouter_volume_1:
+      type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume
+      properties:
+        volume_type:
+          get_input: qrouter_volume_type_1
+        size: '(get_input : qrouter_volume_size_1) * 1024'
+        description:
+          get_input: qrouter_volume_name_1
+    qrouter_volume_0:
+      type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume
+      properties:
+        volume_type:
+          get_input: qrouter_volume_type_0
+        size: '(get_input : qrouter_volume_size_0) * 1024'
+        description:
+          get_input: qrouter_volume_name_0
     qrouter_volume_2:
       type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume
       properties:
@@ -195,7 +195,7 @@ topology_template:
           cluster_name:
             get_input: qrouter_cluster_name
           cdr_network_ip_0:
-          - UNSUPPORTED_ATTRIBUTE_cdr_network_port.fixed_ip_0s
+          - UNSUPPORTED_ATTRIBUTE_cdr_network_port_1.fixed_ip_0s
           repo_ip_0:
             get_input: rpmrepository_ip_0
           mount_colon__slash_data: qrouter_volume_0
@@ -319,18 +319,15 @@ topology_template:
       properties:
         heat_file: ../Artifacts/FEAdd_On_Module_QRouterTemplate.yaml
       members:
+      - cdr_network_port_1
       - qrouter_volume_1
       - qrouter_volume_0
-      - cdr_network_port
       - qrouter_volume_2
       - QRouter1
       - oam_private_net_network_port
   substitution_mappings:
     node_type: org.openecomp.resource.abstract.nodes.heat.FEAdd_On_Module_QRouterTemplate
     capabilities:
-      network.outgoing.bytes_cdr_network_port:
-      - cdr_network_port
-      - network.outgoing.bytes
       binding_QRouter1:
       - QRouter1
       - binding
@@ -358,12 +355,6 @@ topology_template:
       attachment_qrouter_volume_1:
       - qrouter_volume_1
       - attachment
-      attachment_cdr_network_port:
-      - cdr_network_port
-      - attachment
-      network.incoming.packets_cdr_network_port:
-      - cdr_network_port
-      - network.incoming.packets
       disk.device.read.bytes.rate_QRouter1:
       - QRouter1
       - disk.device.read.bytes.rate
@@ -376,9 +367,6 @@ topology_template:
       network.outpoing.packets_oam_private_net_network_port:
       - oam_private_net_network_port
       - network.outpoing.packets
-      network.outpoing.packets_cdr_network_port:
-      - cdr_network_port
-      - network.outpoing.packets
       memory.resident_QRouter1:
       - QRouter1
       - memory.resident
@@ -388,18 +376,15 @@ topology_template:
       host_QRouter1:
       - QRouter1
       - host
-      feature_cdr_network_port:
-      - cdr_network_port
-      - feature
       disk.device.write.bytes.rate_QRouter1:
       - QRouter1
       - disk.device.write.bytes.rate
       disk.device.usage_QRouter1:
       - QRouter1
       - disk.device.usage
-      network.incoming.bytes_cdr_network_port:
-      - cdr_network_port
-      - network.incoming.bytes
+      feature_cdr_network_port_1:
+      - cdr_network_port_1
+      - feature
       instance_QRouter1:
       - QRouter1
       - instance
@@ -445,42 +430,51 @@ topology_template:
       disk.device.capacity_QRouter1:
       - QRouter1
       - disk.device.capacity
-      network.incoming.bytes.rate_cdr_network_port:
-      - cdr_network_port
-      - network.incoming.bytes.rate
       network.outgoing.bytes_oam_private_net_network_port:
       - oam_private_net_network_port
       - network.outgoing.bytes
+      network.incoming.packets.rate_cdr_network_port_1:
+      - cdr_network_port_1
+      - network.incoming.packets.rate
       disk.iops_QRouter1:
       - QRouter1
       - disk.iops
       disk.device.write.requests_QRouter1:
       - QRouter1
       - disk.device.write.requests
+      network.incoming.packets_cdr_network_port_1:
+      - cdr_network_port_1
+      - network.incoming.packets
+      attachment_cdr_network_port_1:
+      - cdr_network_port_1
+      - attachment
       disk.device.write.requests.rate_QRouter1:
       - QRouter1
       - disk.device.write.requests.rate
       disk.device.allocation_QRouter1:
       - QRouter1
       - disk.device.allocation
+      network.outpoing.packets_cdr_network_port_1:
+      - cdr_network_port_1
+      - network.outpoing.packets
       memory_QRouter1:
       - QRouter1
       - memory
       disk.usage_QRouter1:
       - QRouter1
       - disk.usage
+      binding_cdr_network_port_1:
+      - cdr_network_port_1
+      - binding
       scalable_QRouter1:
       - QRouter1
       - scalable
-      network.outgoing.bytes.rate_cdr_network_port:
-      - cdr_network_port
-      - network.outgoing.bytes.rate
       binding_oam_private_net_network_port:
       - oam_private_net_network_port
       - binding
-      network.incoming.packets.rate_cdr_network_port:
-      - cdr_network_port
-      - network.incoming.packets.rate
+      network.incoming.bytes_cdr_network_port_1:
+      - cdr_network_port_1
+      - network.incoming.bytes
       disk.write.bytes_QRouter1:
       - QRouter1
       - disk.write.bytes
@@ -493,6 +487,9 @@ topology_template:
       cpu_QRouter1:
       - QRouter1
       - cpu
+      network.outgoing.bytes.rate_cdr_network_port_1:
+      - cdr_network_port_1
+      - network.outgoing.bytes.rate
       os_QRouter1:
       - QRouter1
       - os
@@ -505,18 +502,18 @@ topology_template:
       disk.read.bytes_QRouter1:
       - QRouter1
       - disk.read.bytes
-      binding_cdr_network_port:
-      - cdr_network_port
-      - binding
+      network.incoming.bytes.rate_cdr_network_port_1:
+      - cdr_network_port_1
+      - network.incoming.bytes.rate
+      network.outgoing.bytes_cdr_network_port_1:
+      - cdr_network_port_1
+      - network.outgoing.bytes
       disk.write.bytes.rate_QRouter1:
       - QRouter1
       - disk.write.bytes.rate
       disk.device.write.bytes_QRouter1:
       - QRouter1
       - disk.device.write.bytes
-      network.outgoing.packets.rate_cdr_network_port:
-      - cdr_network_port
-      - network.outgoing.packets.rate
       disk.device.iops_QRouter1:
       - QRouter1
       - disk.device.iops
@@ -529,6 +526,9 @@ topology_template:
       disk.allocation_QRouter1:
       - QRouter1
       - disk.allocation
+      network.outgoing.packets.rate_cdr_network_port_1:
+      - cdr_network_port_1
+      - network.outgoing.packets.rate
       disk.device.read.requests_QRouter1:
       - QRouter1
       - disk.device.read.requests
@@ -539,6 +539,9 @@ topology_template:
       local_storage_QRouter1:
       - QRouter1
       - local_storage
+      link_cdr_network_port_1:
+      - cdr_network_port_1
+      - link
       dependency_qrouter_volume_1:
       - qrouter_volume_1
       - dependency
@@ -548,18 +551,15 @@ topology_template:
       dependency_qrouter_volume_0:
       - qrouter_volume_0
       - dependency
-      dependency_cdr_network_port:
-      - cdr_network_port
-      - dependency
       link_oam_private_net_network_port:
       - oam_private_net_network_port
       - link
       dependency_qrouter_volume_2:
       - qrouter_volume_2
       - dependency
-      link_cdr_network_port:
-      - cdr_network_port
-      - link
       dependency_QRouter1:
       - QRouter1
+      - dependency
+      dependency_cdr_network_port_1:
+      - cdr_network_port_1
       - 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/securityrulestoportconnection/securityRulesToPortGetResource/out/FEAdd_On_Module_vLBAgentTemplateServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/FEAdd_On_Module_vLBAgentTemplateServiceTemplate.yaml
index d31b276241..5d0b6433cd 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/FEAdd_On_Module_vLBAgentTemplateServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/FEAdd_On_Module_vLBAgentTemplateServiceTemplate.yaml
@@ -154,7 +154,7 @@ topology_template:
       immutable: false
       type: string
   node_templates:
-    packet_mirror_network_port:
+    packet_mirror_network_port_1:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         ip_requirements:
@@ -189,7 +189,7 @@ topology_template:
             get_input: vf_module_id
           packet_mirror_network_cidr:
             get_attribute:
-            - packet_mirror_network_port
+            - packet_mirror_network_port_1
             - subnets
             - 0
             - cidr
@@ -213,7 +213,7 @@ topology_template:
           mount_colon__slash_config: vLBAgent_volume_2
           oam_private_network_cidr:
             get_attribute:
-            - oam_private_net_network_port
+            - oam_private_net_network_port_3
             - subnets
             - 0
             - cidr
@@ -241,9 +241,9 @@ topology_template:
             get_input: vLBAgent_type
           DPDK: DPDK_IP
           oam_private_network_ip_0:
-          - UNSUPPORTED_ATTRIBUTE_oam_private_net_network_port.fixed_ip_0s
+          - UNSUPPORTED_ATTRIBUTE_oam_private_net_network_port_3.fixed_ip_0s
           packet_mirror_network_ip_0:
-          - UNSUPPORTED_ATTRIBUTE_packet_mirror_network_port.fixed_ip_0s
+          - UNSUPPORTED_ATTRIBUTE_packet_mirror_network_port_1.fixed_ip_0s
           vLBAgent_name:
             get_input:
             - vLBAgent_names
@@ -323,7 +323,15 @@ topology_template:
         size: '(get_input : vLBAgent_volume_size_0) * 1024'
         description:
           get_input: vLBAgent_volume_name_0
-    oam_private_net_network_port:
+    vLBAgent_volume_1:
+      type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume
+      properties:
+        volume_type:
+          get_input: vLBAgent_volume_type_1
+        size: '(get_input : vLBAgent_volume_size_1) * 1024'
+        description:
+          get_input: vLBAgent_volume_name_1
+    oam_private_net_network_port_3:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         ip_requirements:
@@ -345,14 +353,6 @@ topology_template:
           capability: tosca.capabilities.network.Bindable
           node: vLBAgentInstance
           relationship: tosca.relationships.network.BindsTo
-    vLBAgent_volume_1:
-      type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume
-      properties:
-        volume_type:
-          get_input: vLBAgent_volume_type_1
-        size: '(get_input : vLBAgent_volume_size_1) * 1024'
-        description:
-          get_input: vLBAgent_volume_name_1
     vLBAgent_volume_2:
       type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume
       properties:
@@ -404,43 +404,46 @@ topology_template:
       properties:
         heat_file: ../Artifacts/FEAdd_On_Module_vLBAgentTemplate.yaml
       members:
-      - packet_mirror_network_port
+      - packet_mirror_network_port_1
       - vLBAgentInstance
       - vLBAgent_volume_0
-      - oam_private_net_network_port
       - vLBAgent_volume_1
+      - oam_private_net_network_port_3
       - vLBAgent_volume_2
       - packet_internal_network_port
   substitution_mappings:
     node_type: org.openecomp.resource.abstract.nodes.heat.FEAdd_On_Module_vLBAgentTemplate
     capabilities:
+      network.incoming.bytes.rate_packet_mirror_network_port_1:
+      - packet_mirror_network_port_1
+      - network.incoming.bytes.rate
       disk.device.read.requests_vLBAgentInstance:
       - vLBAgentInstance
       - disk.device.read.requests
-      attachment_oam_private_net_network_port:
-      - oam_private_net_network_port
-      - attachment
       network.incoming.packets_packet_internal_network_port:
       - packet_internal_network_port
       - network.incoming.packets
+      network.outgoing.bytes.rate_oam_private_net_network_port_3:
+      - oam_private_net_network_port_3
+      - network.outgoing.bytes.rate
       disk.device.usage_vLBAgentInstance:
       - vLBAgentInstance
       - disk.device.usage
-      network.outgoing.bytes_packet_mirror_network_port:
-      - packet_mirror_network_port
-      - network.outgoing.bytes
+      network.incoming.bytes.rate_oam_private_net_network_port_3:
+      - oam_private_net_network_port_3
+      - network.incoming.bytes.rate
       disk.read.requests_vLBAgentInstance:
       - vLBAgentInstance
       - disk.read.requests
-      network.outgoing.bytes.rate_oam_private_net_network_port:
-      - oam_private_net_network_port
-      - network.outgoing.bytes.rate
+      network.incoming.packets_oam_private_net_network_port_3:
+      - oam_private_net_network_port_3
+      - network.incoming.packets
       cpu_util_vLBAgentInstance:
       - vLBAgentInstance
       - cpu_util
-      network.outpoing.packets_oam_private_net_network_port:
-      - oam_private_net_network_port
-      - network.outpoing.packets
+      feature_oam_private_net_network_port_3:
+      - oam_private_net_network_port_3
+      - feature
       feature_vLBAgent_volume_1:
       - vLBAgent_volume_1
       - feature
@@ -453,9 +456,6 @@ topology_template:
       network.incoming.bytes.rate_packet_internal_network_port:
       - packet_internal_network_port
       - network.incoming.bytes.rate
-      network.outgoing.bytes.rate_packet_mirror_network_port:
-      - packet_mirror_network_port
-      - network.outgoing.bytes.rate
       disk.usage_vLBAgentInstance:
       - vLBAgentInstance
       - disk.usage
@@ -465,30 +465,36 @@ topology_template:
       disk.device.iops_vLBAgentInstance:
       - vLBAgentInstance
       - disk.device.iops
+      network.incoming.packets_packet_mirror_network_port_1:
+      - packet_mirror_network_port_1
+      - network.incoming.packets
+      network.outgoing.bytes.rate_packet_mirror_network_port_1:
+      - packet_mirror_network_port_1
+      - network.outgoing.bytes.rate
+      network.outpoing.packets_oam_private_net_network_port_3:
+      - oam_private_net_network_port_3
+      - network.outpoing.packets
       binding_packet_internal_network_port:
       - packet_internal_network_port
       - binding
       disk.device.write.bytes_vLBAgentInstance:
       - vLBAgentInstance
       - disk.device.write.bytes
-      network.incoming.bytes_oam_private_net_network_port:
-      - oam_private_net_network_port
-      - network.incoming.bytes
-      feature_oam_private_net_network_port:
-      - oam_private_net_network_port
-      - feature
-      network.outpoing.packets_packet_mirror_network_port:
-      - packet_mirror_network_port
-      - network.outpoing.packets
-      network.incoming.bytes_packet_mirror_network_port:
-      - packet_mirror_network_port
-      - network.incoming.bytes
-      network.incoming.packets_packet_mirror_network_port:
-      - packet_mirror_network_port
-      - network.incoming.packets
+      attachment_packet_mirror_network_port_1:
+      - packet_mirror_network_port_1
+      - attachment
+      network.incoming.packets.rate_oam_private_net_network_port_3:
+      - oam_private_net_network_port_3
+      - network.incoming.packets.rate
+      binding_oam_private_net_network_port_3:
+      - oam_private_net_network_port_3
+      - binding
       endpoint_vLBAgentInstance:
       - vLBAgentInstance
       - endpoint
+      binding_packet_mirror_network_port_1:
+      - packet_mirror_network_port_1
+      - binding
       binding_vLBAgentInstance:
       - vLBAgentInstance
       - binding
@@ -501,21 +507,12 @@ topology_template:
       attachment_packet_internal_network_port:
       - packet_internal_network_port
       - attachment
-      network.incoming.packets.rate_packet_mirror_network_port:
-      - packet_mirror_network_port
-      - network.incoming.packets.rate
-      network.outgoing.packets.rate_packet_mirror_network_port:
-      - packet_mirror_network_port
-      - network.outgoing.packets.rate
       disk.read.bytes_vLBAgentInstance:
       - vLBAgentInstance
       - disk.read.bytes
       memory.usage_vLBAgentInstance:
       - vLBAgentInstance
       - memory.usage
-      network.incoming.bytes.rate_oam_private_net_network_port:
-      - oam_private_net_network_port
-      - network.incoming.bytes.rate
       scalable_vLBAgentInstance:
       - vLBAgentInstance
       - scalable
@@ -534,9 +531,6 @@ topology_template:
       disk.write.bytes_vLBAgentInstance:
       - vLBAgentInstance
       - disk.write.bytes
-      network.outgoing.bytes_oam_private_net_network_port:
-      - oam_private_net_network_port
-      - network.outgoing.bytes
       memory_vLBAgentInstance:
       - vLBAgentInstance
       - memory
@@ -549,15 +543,36 @@ topology_template:
       disk.iops_vLBAgentInstance:
       - vLBAgentInstance
       - disk.iops
+      network.outgoing.packets.rate_oam_private_net_network_port_3:
+      - oam_private_net_network_port_3
+      - network.outgoing.packets.rate
+      feature_packet_mirror_network_port_1:
+      - packet_mirror_network_port_1
+      - feature
       instance_vLBAgentInstance:
       - vLBAgentInstance
       - instance
+      network.incoming.bytes_packet_mirror_network_port_1:
+      - packet_mirror_network_port_1
+      - network.incoming.bytes
+      attachment_oam_private_net_network_port_3:
+      - oam_private_net_network_port_3
+      - attachment
       network.outgoing.bytes_packet_internal_network_port:
       - packet_internal_network_port
       - network.outgoing.bytes
+      network.outgoing.packets.rate_packet_mirror_network_port_1:
+      - packet_mirror_network_port_1
+      - network.outgoing.packets.rate
       network.incoming.bytes_packet_internal_network_port:
       - packet_internal_network_port
       - network.incoming.bytes
+      network.outpoing.packets_packet_mirror_network_port_1:
+      - packet_mirror_network_port_1
+      - network.outpoing.packets
+      network.outgoing.bytes_packet_mirror_network_port_1:
+      - packet_mirror_network_port_1
+      - network.outgoing.bytes
       disk.device.read.requests.rate_vLBAgentInstance:
       - vLBAgentInstance
       - disk.device.read.requests.rate
@@ -567,18 +582,12 @@ topology_template:
       network.incoming.packets.rate_packet_internal_network_port:
       - packet_internal_network_port
       - network.incoming.packets.rate
-      attachment_packet_mirror_network_port:
-      - packet_mirror_network_port
-      - attachment
       disk.write.requests.rate_vLBAgentInstance:
       - vLBAgentInstance
       - disk.write.requests.rate
       attachment_vLBAgent_volume_0:
       - vLBAgent_volume_0
       - attachment
-      binding_oam_private_net_network_port:
-      - oam_private_net_network_port
-      - binding
       disk.device.read.bytes_vLBAgentInstance:
       - vLBAgentInstance
       - disk.device.read.bytes
@@ -594,27 +603,18 @@ topology_template:
       disk.device.write.requests.rate_vLBAgentInstance:
       - vLBAgentInstance
       - disk.device.write.requests.rate
-      feature_packet_mirror_network_port:
-      - packet_mirror_network_port
-      - feature
-      binding_packet_mirror_network_port:
-      - packet_mirror_network_port
-      - binding
-      network.incoming.packets_oam_private_net_network_port:
-      - oam_private_net_network_port
-      - network.incoming.packets
-      network.incoming.bytes.rate_packet_mirror_network_port:
-      - packet_mirror_network_port
-      - network.incoming.bytes.rate
-      network.incoming.packets.rate_oam_private_net_network_port:
-      - oam_private_net_network_port
-      - network.incoming.packets.rate
       disk.device.read.bytes.rate_vLBAgentInstance:
       - vLBAgentInstance
       - disk.device.read.bytes.rate
+      network.outgoing.bytes_oam_private_net_network_port_3:
+      - oam_private_net_network_port_3
+      - network.outgoing.bytes
       cpu.delta_vLBAgentInstance:
       - vLBAgentInstance
       - cpu.delta
+      network.incoming.bytes_oam_private_net_network_port_3:
+      - oam_private_net_network_port_3
+      - network.incoming.bytes
       disk.capacity_vLBAgentInstance:
       - vLBAgentInstance
       - disk.capacity
@@ -639,6 +639,9 @@ topology_template:
       network.outpoing.packets_packet_internal_network_port:
       - packet_internal_network_port
       - network.outpoing.packets
+      network.incoming.packets.rate_packet_mirror_network_port_1:
+      - packet_mirror_network_port_1
+      - network.incoming.packets.rate
       vcpus_vLBAgentInstance:
       - vLBAgentInstance
       - vcpus
@@ -651,9 +654,6 @@ topology_template:
       disk.write.bytes.rate_vLBAgentInstance:
       - vLBAgentInstance
       - disk.write.bytes.rate
-      network.outgoing.packets.rate_oam_private_net_network_port:
-      - oam_private_net_network_port
-      - network.outgoing.packets.rate
     requirements:
       dependency_vLBAgentInstance:
       - vLBAgentInstance
@@ -661,29 +661,29 @@ topology_template:
       dependency_packet_internal_network_port:
       - packet_internal_network_port
       - dependency
+      dependency_oam_private_net_network_port_3:
+      - oam_private_net_network_port_3
+      - dependency
       link_packet_internal_network_port:
       - packet_internal_network_port
       - link
-      dependency_oam_private_net_network_port:
-      - oam_private_net_network_port
-      - dependency
+      link_oam_private_net_network_port_3:
+      - oam_private_net_network_port_3
+      - link
       dependency_vLBAgent_volume_1:
       - vLBAgent_volume_1
       - dependency
       dependency_vLBAgent_volume_2:
       - vLBAgent_volume_2
       - dependency
-      dependency_packet_mirror_network_port:
-      - packet_mirror_network_port
+      dependency_packet_mirror_network_port_1:
+      - packet_mirror_network_port_1
       - dependency
-      link_oam_private_net_network_port:
-      - oam_private_net_network_port
-      - link
       dependency_vLBAgent_volume_0:
       - vLBAgent_volume_0
       - dependency
-      link_packet_mirror_network_port:
-      - packet_mirror_network_port
+      link_packet_mirror_network_port_1:
+      - packet_mirror_network_port_1
       - link
       local_storage_vLBAgentInstance:
       - vLBAgentInstance
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/FEAdd_On_Module_vLBTemplateServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/FEAdd_On_Module_vLBTemplateServiceTemplate.yaml
index e6c6845c42..e3896b2be6 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/FEAdd_On_Module_vLBTemplateServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/FEAdd_On_Module_vLBTemplateServiceTemplate.yaml
@@ -146,7 +146,7 @@ topology_template:
       immutable: false
       type: float
   node_templates:
-    packet_mirror_network_port:
+    packet_internal_network_port_2:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         ip_requirements:
@@ -161,31 +161,13 @@ topology_template:
           mac_count_required:
             is_required: false
         network:
-          get_input: packet_mirror_network
+          get_input: packet_internal_network
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
           node: vLBInstance
           relationship: tosca.relationships.network.BindsTo
-    vLB_volume_1:
-      type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume
-      properties:
-        volume_type:
-          get_input: vLB_volume_type_1
-        size: '(get_input : vLB_volume_size_1) * 1024'
-    vLB_volume_0:
-      type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume
-      properties:
-        volume_type:
-          get_input: vLB_volume_type_0
-        size: '(get_input : vLB_volume_size_0) * 1024'
-    vLB_volume_2:
-      type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume
-      properties:
-        volume_type:
-          get_input: vLB_volume_type_2
-        size: '(get_input : vLB_volume_size_2) * 1024'
-    oam_private_net_network_port:
+    oam_private_net_network_port_2:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         ip_requirements:
@@ -207,7 +189,7 @@ topology_template:
           capability: tosca.capabilities.network.Bindable
           node: vLBInstance
           relationship: tosca.relationships.network.BindsTo
-    packet_internal_network_port:
+    packet_mirror_network_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         ip_requirements:
@@ -222,12 +204,30 @@ topology_template:
           mac_count_required:
             is_required: false
         network:
-          get_input: packet_internal_network
+          get_input: packet_mirror_network
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
           node: vLBInstance
           relationship: tosca.relationships.network.BindsTo
+    vLB_volume_1:
+      type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume
+      properties:
+        volume_type:
+          get_input: vLB_volume_type_1
+        size: '(get_input : vLB_volume_size_1) * 1024'
+    vLB_volume_0:
+      type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume
+      properties:
+        volume_type:
+          get_input: vLB_volume_type_0
+        size: '(get_input : vLB_volume_size_0) * 1024'
+    vLB_volume_2:
+      type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume
+      properties:
+        volume_type:
+          get_input: vLB_volume_type_2
+        size: '(get_input : vLB_volume_size_2) * 1024'
     vLBInstance:
       type: org.openecomp.resource.vfc.nodes.heat.vLB
       properties:
@@ -247,7 +247,7 @@ topology_template:
             - 0
             - cidr
           packet_internal_network_ip_0:
-          - UNSUPPORTED_ATTRIBUTE_packet_internal_network_port.fixed_ip_0s
+          - UNSUPPORTED_ATTRIBUTE_packet_internal_network_port_2.fixed_ip_0s
           version_number:
             get_input: vLB_version_name
           machine_name:
@@ -264,7 +264,7 @@ topology_template:
           mount_colon__slash_config: vLB_volume_2
           oam_private_network_cidr:
             get_attribute:
-            - oam_private_net_network_port
+            - oam_private_net_network_port_2
             - subnets
             - 0
             - cidr
@@ -284,7 +284,7 @@ topology_template:
             get_input: vLB_version_name
           packet_internal_network_cidr:
             get_attribute:
-            - packet_internal_network_port
+            - packet_internal_network_port_2
             - subnets
             - 0
             - cidr
@@ -292,7 +292,7 @@ topology_template:
             get_input: vLB_type
           DPDK: DPDK_IP
           oam_private_network_ip_0:
-          - UNSUPPORTED_ATTRIBUTE_oam_private_net_network_port.fixed_ip_0s
+          - UNSUPPORTED_ATTRIBUTE_oam_private_net_network_port_2.fixed_ip_0s
           packet_mirror_network_ip_0:
           - UNSUPPORTED_ATTRIBUTE_packet_mirror_network_port.fixed_ip_0s
           vLBAgent_name:
@@ -381,25 +381,25 @@ topology_template:
       properties:
         heat_file: ../Artifacts/FEAdd_On_Module_vLBTemplate.yaml
       members:
+      - packet_internal_network_port_2
+      - oam_private_net_network_port_2
       - packet_mirror_network_port
       - vLB_volume_1
       - vLB_volume_0
       - vLB_volume_2
-      - oam_private_net_network_port
-      - packet_internal_network_port
       - vLBInstance
   substitution_mappings:
     node_type: org.openecomp.resource.abstract.nodes.heat.FEAdd_On_Module_vLBTemplate
     capabilities:
-      attachment_oam_private_net_network_port:
-      - oam_private_net_network_port
-      - attachment
-      network.incoming.packets_packet_internal_network_port:
-      - packet_internal_network_port
-      - network.incoming.packets
       disk.iops_vLBInstance:
       - vLBInstance
       - disk.iops
+      network.incoming.packets_packet_internal_network_port_2:
+      - packet_internal_network_port_2
+      - network.incoming.packets
+      network.outgoing.bytes.rate_oam_private_net_network_port_2:
+      - oam_private_net_network_port_2
+      - network.outgoing.bytes.rate
       feature_vLBInstance:
       - vLBInstance
       - feature
@@ -409,57 +409,72 @@ topology_template:
       os_vLBInstance:
       - vLBInstance
       - os
+      network.outgoing.bytes.rate_packet_internal_network_port_2:
+      - packet_internal_network_port_2
+      - network.outgoing.bytes.rate
+      network.incoming.packets_oam_private_net_network_port_2:
+      - oam_private_net_network_port_2
+      - network.incoming.packets
       disk.device.write.bytes.rate_vLBInstance:
       - vLBInstance
       - disk.device.write.bytes.rate
       network.outgoing.bytes_packet_mirror_network_port:
       - packet_mirror_network_port
       - network.outgoing.bytes
-      network.outgoing.bytes.rate_oam_private_net_network_port:
-      - oam_private_net_network_port
-      - network.outgoing.bytes.rate
+      network.incoming.bytes.rate_oam_private_net_network_port_2:
+      - oam_private_net_network_port_2
+      - network.incoming.bytes.rate
       disk.write.bytes.rate_vLBInstance:
       - vLBInstance
       - disk.write.bytes.rate
-      network.outpoing.packets_oam_private_net_network_port:
-      - oam_private_net_network_port
-      - network.outpoing.packets
+      feature_oam_private_net_network_port_2:
+      - oam_private_net_network_port_2
+      - feature
+      network.outgoing.bytes_packet_internal_network_port_2:
+      - packet_internal_network_port_2
+      - network.outgoing.bytes
+      network.incoming.packets.rate_packet_internal_network_port_2:
+      - packet_internal_network_port_2
+      - network.incoming.packets.rate
       memory.usage_vLBInstance:
       - vLBInstance
       - memory.usage
       host_vLBInstance:
       - vLBInstance
       - host
-      network.incoming.bytes.rate_packet_internal_network_port:
-      - packet_internal_network_port
-      - network.incoming.bytes.rate
       network.outgoing.bytes.rate_packet_mirror_network_port:
       - packet_mirror_network_port
       - network.outgoing.bytes.rate
+      network.outpoing.packets_packet_internal_network_port_2:
+      - packet_internal_network_port_2
+      - network.outpoing.packets
       disk.device.capacity_vLBInstance:
       - vLBInstance
       - disk.device.capacity
-      binding_packet_internal_network_port:
-      - packet_internal_network_port
-      - binding
+      network.outpoing.packets_oam_private_net_network_port_2:
+      - oam_private_net_network_port_2
+      - network.outpoing.packets
+      network.incoming.packets.rate_oam_private_net_network_port_2:
+      - oam_private_net_network_port_2
+      - network.incoming.packets.rate
       instance_vLBInstance:
       - vLBInstance
       - instance
-      network.incoming.bytes_oam_private_net_network_port:
-      - oam_private_net_network_port
-      - network.incoming.bytes
       binding_vLBInstance:
       - vLBInstance
       - binding
-      feature_oam_private_net_network_port:
-      - oam_private_net_network_port
-      - feature
+      binding_oam_private_net_network_port_2:
+      - oam_private_net_network_port_2
+      - binding
       disk.device.latency_vLBInstance:
       - vLBInstance
       - disk.device.latency
       network.outpoing.packets_packet_mirror_network_port:
       - packet_mirror_network_port
       - network.outpoing.packets
+      binding_packet_internal_network_port_2:
+      - packet_internal_network_port_2
+      - binding
       network.incoming.bytes_packet_mirror_network_port:
       - packet_mirror_network_port
       - network.incoming.bytes
@@ -469,30 +484,24 @@ topology_template:
       disk.device.read.requests.rate_vLBInstance:
       - vLBInstance
       - disk.device.read.requests.rate
-      attachment_packet_internal_network_port:
-      - packet_internal_network_port
-      - attachment
       network.incoming.packets.rate_packet_mirror_network_port:
       - packet_mirror_network_port
       - network.incoming.packets.rate
       network.outgoing.packets.rate_packet_mirror_network_port:
       - packet_mirror_network_port
       - network.outgoing.packets.rate
-      network.incoming.bytes.rate_oam_private_net_network_port:
-      - oam_private_net_network_port
-      - network.incoming.bytes.rate
       memory_vLBInstance:
       - vLBInstance
       - memory
+      network.incoming.bytes.rate_packet_internal_network_port_2:
+      - packet_internal_network_port_2
+      - network.incoming.bytes.rate
       cpu.delta_vLBInstance:
       - vLBInstance
       - cpu.delta
       disk.write.bytes_vLBInstance:
       - vLBInstance
       - disk.write.bytes
-      network.outgoing.bytes_oam_private_net_network_port:
-      - oam_private_net_network_port
-      - network.outgoing.bytes
       disk.write.requests_vLBInstance:
       - vLBInstance
       - disk.write.requests
@@ -505,18 +514,21 @@ topology_template:
       disk.device.iops_vLBInstance:
       - vLBInstance
       - disk.device.iops
-      network.outgoing.packets.rate_packet_internal_network_port:
-      - packet_internal_network_port
-      - network.outgoing.packets.rate
       disk.capacity_vLBInstance:
       - vLBInstance
       - disk.capacity
       disk.device.read.bytes_vLBInstance:
       - vLBInstance
       - disk.device.read.bytes
+      attachment_packet_internal_network_port_2:
+      - packet_internal_network_port_2
+      - attachment
       attachment_vLB_volume_0:
       - vLB_volume_0
       - attachment
+      network.outgoing.packets.rate_oam_private_net_network_port_2:
+      - oam_private_net_network_port_2
+      - network.outgoing.packets.rate
       attachment_vLB_volume_1:
       - vLB_volume_1
       - attachment
@@ -529,51 +541,51 @@ topology_template:
       memory.resident_vLBInstance:
       - vLBInstance
       - memory.resident
-      network.outgoing.bytes_packet_internal_network_port:
-      - packet_internal_network_port
-      - network.outgoing.bytes
       disk.write.requests.rate_vLBInstance:
       - vLBInstance
       - disk.write.requests.rate
       disk.device.write.requests_vLBInstance:
       - vLBInstance
       - disk.device.write.requests
-      network.incoming.bytes_packet_internal_network_port:
-      - packet_internal_network_port
-      - network.incoming.bytes
-      network.incoming.packets.rate_packet_internal_network_port:
-      - packet_internal_network_port
-      - network.incoming.packets.rate
+      network.outgoing.packets.rate_packet_internal_network_port_2:
+      - packet_internal_network_port_2
+      - network.outgoing.packets.rate
+      attachment_oam_private_net_network_port_2:
+      - oam_private_net_network_port_2
+      - attachment
       attachment_packet_mirror_network_port:
       - packet_mirror_network_port
       - attachment
       disk.read.requests_vLBInstance:
       - vLBInstance
       - disk.read.requests
-      binding_oam_private_net_network_port:
-      - oam_private_net_network_port
-      - binding
       disk.device.read.requests_vLBInstance:
       - vLBInstance
       - disk.device.read.requests
       disk.latency_vLBInstance:
       - vLBInstance
       - disk.latency
+      network.incoming.bytes_packet_internal_network_port_2:
+      - packet_internal_network_port_2
+      - network.incoming.bytes
       feature_packet_mirror_network_port:
       - packet_mirror_network_port
       - feature
+      feature_packet_internal_network_port_2:
+      - packet_internal_network_port_2
+      - feature
       binding_packet_mirror_network_port:
       - packet_mirror_network_port
       - binding
-      network.incoming.packets_oam_private_net_network_port:
-      - oam_private_net_network_port
-      - network.incoming.packets
+      network.outgoing.bytes_oam_private_net_network_port_2:
+      - oam_private_net_network_port_2
+      - network.outgoing.bytes
+      network.incoming.bytes_oam_private_net_network_port_2:
+      - oam_private_net_network_port_2
+      - network.incoming.bytes
       network.incoming.bytes.rate_packet_mirror_network_port:
       - packet_mirror_network_port
       - network.incoming.bytes.rate
-      network.incoming.packets.rate_oam_private_net_network_port:
-      - oam_private_net_network_port
-      - network.incoming.packets.rate
       disk.device.write.requests.rate_vLBInstance:
       - vLBInstance
       - disk.device.write.requests.rate
@@ -595,9 +607,6 @@ topology_template:
       feature_vLB_volume_1:
       - vLB_volume_1
       - feature
-      network.outgoing.bytes.rate_packet_internal_network_port:
-      - packet_internal_network_port
-      - network.outgoing.bytes.rate
       cpu_vLBInstance:
       - vLBInstance
       - cpu
@@ -607,9 +616,6 @@ topology_template:
       endpoint_vLBInstance:
       - vLBInstance
       - endpoint
-      network.outpoing.packets_packet_internal_network_port:
-      - packet_internal_network_port
-      - network.outpoing.packets
       disk.device.allocation_vLBInstance:
       - vLBInstance
       - disk.device.allocation
@@ -622,15 +628,9 @@ topology_template:
       disk.usage_vLBInstance:
       - vLBInstance
       - disk.usage
-      feature_packet_internal_network_port:
-      - packet_internal_network_port
-      - feature
       cpu_util_vLBInstance:
       - vLBInstance
       - cpu_util
-      network.outgoing.packets.rate_oam_private_net_network_port:
-      - oam_private_net_network_port
-      - network.outgoing.packets.rate
     requirements:
       dependency_vLB_volume_0:
       - vLB_volume_0
@@ -641,27 +641,27 @@ topology_template:
       local_storage_vLBInstance:
       - vLBInstance
       - local_storage
-      dependency_packet_internal_network_port:
-      - packet_internal_network_port
+      dependency_oam_private_net_network_port_2:
+      - oam_private_net_network_port_2
       - dependency
-      link_packet_internal_network_port:
-      - packet_internal_network_port
-      - link
       dependency_vLB_volume_2:
       - vLB_volume_2
       - dependency
-      dependency_oam_private_net_network_port:
-      - oam_private_net_network_port
+      link_oam_private_net_network_port_2:
+      - oam_private_net_network_port_2
+      - link
+      dependency_packet_internal_network_port_2:
+      - packet_internal_network_port_2
       - dependency
       dependency_packet_mirror_network_port:
       - packet_mirror_network_port
       - dependency
-      link_oam_private_net_network_port:
-      - oam_private_net_network_port
-      - link
       dependency_vLBInstance:
       - vLBInstance
       - dependency
       link_packet_mirror_network_port:
       - packet_mirror_network_port
+      - link
+      link_packet_internal_network_port_2:
+      - packet_internal_network_port_2
       - link
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/FEAdd_On_Module_vProbeTemplateServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/FEAdd_On_Module_vProbeTemplateServiceTemplate.yaml
index 9808460108..5edca0a8d6 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/FEAdd_On_Module_vProbeTemplateServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/FEAdd_On_Module_vProbeTemplateServiceTemplate.yaml
@@ -180,7 +180,7 @@ topology_template:
           cdr_network_ip_0:
           - UNSUPPORTED_ATTRIBUTE_cdr_network_port.fixed_ip_0s
           packet_internal_network_ip_0:
-          - UNSUPPORTED_ATTRIBUTE_packet_internal_network_port.fixed_ip_0s
+          - UNSUPPORTED_ATTRIBUTE_packet_internal_network_port_1.fixed_ip_0s
           version_number:
             get_input: vProbe_version_name
           vprobe_type:
@@ -207,7 +207,7 @@ topology_template:
           mount_colon__slash_config: vprobe_volume_2
           oam_private_network_cidr:
             get_attribute:
-            - oam_private_net_network_port
+            - oam_private_net_network_port_1
             - subnets
             - 0
             - cidr
@@ -229,7 +229,7 @@ topology_template:
             get_input: vprobe_AppDependenciesMachineType
           packet_internal_network_cidr:
             get_attribute:
-            - packet_internal_network_port
+            - packet_internal_network_port_1
             - subnets
             - 0
             - cidr
@@ -237,7 +237,7 @@ topology_template:
             get_input: vProbe_node_count
           DPDK: DPDK_IP
           oam_private_network_ip_0:
-          - UNSUPPORTED_ATTRIBUTE_oam_private_net_network_port.fixed_ip_0s
+          - UNSUPPORTED_ATTRIBUTE_oam_private_net_network_port_1.fixed_ip_0s
           region:
             get_input: region_name
           manager_oam_direct_ip_0:
@@ -322,7 +322,7 @@ topology_template:
         size: '(get_input : vprobe_volume_size_0) * 1024'
         description:
           get_input: vprobe_volume_name_0
-    cdr_network_port:
+    oam_private_net_network_port_1:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         ip_requirements:
@@ -336,14 +336,15 @@ topology_template:
         mac_requirements:
           mac_count_required:
             is_required: false
+        network_role_tag: oam_private
         network:
-          get_input: cdr_network
+          get_input: oam_private_net_name
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
           node: ProbeInstance
           relationship: tosca.relationships.network.BindsTo
-    oam_private_net_network_port:
+    cdr_network_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         ip_requirements:
@@ -357,15 +358,14 @@ topology_template:
         mac_requirements:
           mac_count_required:
             is_required: false
-        network_role_tag: oam_private
         network:
-          get_input: oam_private_net_name
+          get_input: cdr_network
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
           node: ProbeInstance
           relationship: tosca.relationships.network.BindsTo
-    packet_internal_network_port:
+    packet_internal_network_port_1:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         ip_requirements:
@@ -412,9 +412,9 @@ topology_template:
       - vprobe_volume_2
       - vprobe_volume_1
       - vprobe_volume_0
+      - oam_private_net_network_port_1
       - cdr_network_port
-      - oam_private_net_network_port
-      - packet_internal_network_port
+      - packet_internal_network_port_1
   substitution_mappings:
     node_type: org.openecomp.resource.abstract.nodes.heat.FEAdd_On_Module_vProbeTemplate
     capabilities:
@@ -427,15 +427,21 @@ topology_template:
       disk.device.write.requests_ProbeInstance:
       - ProbeInstance
       - disk.device.write.requests
-      attachment_oam_private_net_network_port:
-      - oam_private_net_network_port
-      - attachment
       disk.iops_ProbeInstance:
       - ProbeInstance
       - disk.iops
-      network.incoming.packets_packet_internal_network_port:
-      - packet_internal_network_port
+      network.incoming.packets_packet_internal_network_port_1:
+      - packet_internal_network_port_1
+      - network.incoming.packets
+      network.outgoing.bytes.rate_oam_private_net_network_port_1:
+      - oam_private_net_network_port_1
+      - network.outgoing.bytes.rate
+      network.incoming.packets_oam_private_net_network_port_1:
+      - oam_private_net_network_port_1
       - network.incoming.packets
+      network.outgoing.bytes.rate_packet_internal_network_port_1:
+      - packet_internal_network_port_1
+      - network.outgoing.bytes.rate
       attachment_cdr_network_port:
       - cdr_network_port
       - attachment
@@ -445,54 +451,57 @@ topology_template:
       feature_ProbeInstance:
       - ProbeInstance
       - feature
-      network.outgoing.bytes.rate_oam_private_net_network_port:
-      - oam_private_net_network_port
-      - network.outgoing.bytes.rate
-      network.outpoing.packets_oam_private_net_network_port:
-      - oam_private_net_network_port
-      - network.outpoing.packets
+      feature_oam_private_net_network_port_1:
+      - oam_private_net_network_port_1
+      - feature
+      network.incoming.bytes.rate_oam_private_net_network_port_1:
+      - oam_private_net_network_port_1
+      - network.incoming.bytes.rate
+      network.outgoing.bytes_packet_internal_network_port_1:
+      - packet_internal_network_port_1
+      - network.outgoing.bytes
       network.outpoing.packets_cdr_network_port:
       - cdr_network_port
       - network.outpoing.packets
-      network.incoming.bytes.rate_packet_internal_network_port:
-      - packet_internal_network_port
-      - network.incoming.bytes.rate
+      network.incoming.packets.rate_packet_internal_network_port_1:
+      - packet_internal_network_port_1
+      - network.incoming.packets.rate
       disk.device.latency_ProbeInstance:
       - ProbeInstance
       - disk.device.latency
       feature_cdr_network_port:
       - cdr_network_port
       - feature
+      network.outpoing.packets_packet_internal_network_port_1:
+      - packet_internal_network_port_1
+      - network.outpoing.packets
       disk.write.bytes.rate_ProbeInstance:
       - ProbeInstance
       - disk.write.bytes.rate
+      network.outpoing.packets_oam_private_net_network_port_1:
+      - oam_private_net_network_port_1
+      - network.outpoing.packets
       network.incoming.bytes_cdr_network_port:
       - cdr_network_port
       - network.incoming.bytes
       host_ProbeInstance:
       - ProbeInstance
       - host
-      binding_packet_internal_network_port:
-      - packet_internal_network_port
+      network.incoming.packets.rate_oam_private_net_network_port_1:
+      - oam_private_net_network_port_1
+      - network.incoming.packets.rate
+      binding_oam_private_net_network_port_1:
+      - oam_private_net_network_port_1
       - binding
-      network.incoming.bytes_oam_private_net_network_port:
-      - oam_private_net_network_port
-      - network.incoming.bytes
       memory_ProbeInstance:
       - ProbeInstance
       - memory
-      feature_oam_private_net_network_port:
-      - oam_private_net_network_port
-      - feature
-      attachment_packet_internal_network_port:
-      - packet_internal_network_port
-      - attachment
+      binding_packet_internal_network_port_1:
+      - packet_internal_network_port_1
+      - binding
       disk.device.read.requests_ProbeInstance:
       - ProbeInstance
       - disk.device.read.requests
-      network.incoming.bytes.rate_oam_private_net_network_port:
-      - oam_private_net_network_port
-      - network.incoming.bytes.rate
       memory.resident_ProbeInstance:
       - ProbeInstance
       - memory.resident
@@ -517,36 +526,39 @@ topology_template:
       disk.write.bytes_ProbeInstance:
       - ProbeInstance
       - disk.write.bytes
-      network.outgoing.bytes_oam_private_net_network_port:
-      - oam_private_net_network_port
-      - network.outgoing.bytes
+      network.incoming.bytes.rate_packet_internal_network_port_1:
+      - packet_internal_network_port_1
+      - network.incoming.bytes.rate
       disk.device.capacity_ProbeInstance:
       - ProbeInstance
       - disk.device.capacity
+      attachment_packet_internal_network_port_1:
+      - packet_internal_network_port_1
+      - attachment
       endpoint_ProbeInstance:
       - ProbeInstance
       - endpoint
-      network.outgoing.packets.rate_packet_internal_network_port:
-      - packet_internal_network_port
-      - network.outgoing.packets.rate
       disk.ephemeral.size_ProbeInstance:
       - ProbeInstance
       - disk.ephemeral.size
       disk.read.bytes.rate_ProbeInstance:
       - ProbeInstance
       - disk.read.bytes.rate
+      network.outgoing.packets.rate_oam_private_net_network_port_1:
+      - oam_private_net_network_port_1
+      - network.outgoing.packets.rate
       disk.latency_ProbeInstance:
       - ProbeInstance
       - disk.latency
       os_ProbeInstance:
       - ProbeInstance
       - os
-      network.outgoing.bytes_packet_internal_network_port:
-      - packet_internal_network_port
-      - network.outgoing.bytes
-      network.incoming.bytes_packet_internal_network_port:
-      - packet_internal_network_port
-      - network.incoming.bytes
+      network.outgoing.packets.rate_packet_internal_network_port_1:
+      - packet_internal_network_port_1
+      - network.outgoing.packets.rate
+      attachment_oam_private_net_network_port_1:
+      - oam_private_net_network_port_1
+      - attachment
       cpu_util_ProbeInstance:
       - ProbeInstance
       - cpu_util
@@ -568,9 +580,6 @@ topology_template:
       attachment_vprobe_volume_2:
       - vprobe_volume_2
       - attachment
-      network.incoming.packets.rate_packet_internal_network_port:
-      - packet_internal_network_port
-      - network.incoming.packets.rate
       attachment_vprobe_volume_1:
       - vprobe_volume_1
       - attachment
@@ -580,9 +589,6 @@ topology_template:
       network.outgoing.bytes.rate_cdr_network_port:
       - cdr_network_port
       - network.outgoing.bytes.rate
-      binding_oam_private_net_network_port:
-      - oam_private_net_network_port
-      - binding
       binding_ProbeInstance:
       - ProbeInstance
       - binding
@@ -592,6 +598,9 @@ topology_template:
       disk.capacity_ProbeInstance:
       - ProbeInstance
       - disk.capacity
+      network.incoming.bytes_packet_internal_network_port_1:
+      - packet_internal_network_port_1
+      - network.incoming.bytes
       disk.write.requests.rate_ProbeInstance:
       - ProbeInstance
       - disk.write.requests.rate
@@ -604,15 +613,18 @@ topology_template:
       feature_vprobe_volume_2:
       - vprobe_volume_2
       - feature
-      network.incoming.packets_oam_private_net_network_port:
-      - oam_private_net_network_port
-      - network.incoming.packets
+      feature_packet_internal_network_port_1:
+      - packet_internal_network_port_1
+      - feature
       feature_vprobe_volume_0:
       - vprobe_volume_0
       - feature
-      network.incoming.packets.rate_oam_private_net_network_port:
-      - oam_private_net_network_port
-      - network.incoming.packets.rate
+      network.outgoing.bytes_oam_private_net_network_port_1:
+      - oam_private_net_network_port_1
+      - network.outgoing.bytes
+      network.incoming.bytes_oam_private_net_network_port_1:
+      - oam_private_net_network_port_1
+      - network.incoming.bytes
       disk.device.read.requests.rate_ProbeInstance:
       - ProbeInstance
       - disk.device.read.requests.rate
@@ -631,9 +643,6 @@ topology_template:
       disk.usage_ProbeInstance:
       - ProbeInstance
       - disk.usage
-      network.outgoing.bytes.rate_packet_internal_network_port:
-      - packet_internal_network_port
-      - network.outgoing.bytes.rate
       binding_cdr_network_port:
       - cdr_network_port
       - binding
@@ -646,34 +655,19 @@ topology_template:
       network.outgoing.packets.rate_cdr_network_port:
       - cdr_network_port
       - network.outgoing.packets.rate
-      network.outpoing.packets_packet_internal_network_port:
-      - packet_internal_network_port
-      - network.outpoing.packets
-      feature_packet_internal_network_port:
-      - packet_internal_network_port
-      - feature
       disk.device.read.bytes.rate_ProbeInstance:
       - ProbeInstance
       - disk.device.read.bytes.rate
-      network.outgoing.packets.rate_oam_private_net_network_port:
-      - oam_private_net_network_port
-      - network.outgoing.packets.rate
     requirements:
-      dependency_packet_internal_network_port:
-      - packet_internal_network_port
-      - dependency
-      link_packet_internal_network_port:
-      - packet_internal_network_port
+      link_oam_private_net_network_port_1:
+      - oam_private_net_network_port_1
       - link
-      dependency_oam_private_net_network_port:
-      - oam_private_net_network_port
+      dependency_oam_private_net_network_port_1:
+      - oam_private_net_network_port_1
       - dependency
       dependency_cdr_network_port:
       - cdr_network_port
       - dependency
-      link_oam_private_net_network_port:
-      - oam_private_net_network_port
-      - link
       dependency_vprobe_volume_1:
       - vprobe_volume_1
       - dependency
@@ -689,6 +683,12 @@ topology_template:
       local_storage_ProbeInstance:
       - ProbeInstance
       - local_storage
+      dependency_packet_internal_network_port_1:
+      - packet_internal_network_port_1
+      - dependency
+      link_packet_internal_network_port_1:
+      - packet_internal_network_port_1
+      - link
       dependency_vprobe_volume_2:
       - vprobe_volume_2
       - 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/securityrulestoportconnection/securityRulesToPortGetResource/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 86de04a96c..01329a4aab 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -131,33 +131,33 @@ node_types:
         required: true
         status: SUPPORTED
     requirements:
-    - dependency_qrouter_volume_1:
+    - dependency_cdr_network_port_1:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_qrouter_volume_0:
+    - link_cdr_network_port_1:
+        capability: tosca.capabilities.network.Linkable
+        relationship: tosca.relationships.network.LinksTo
+        occurrences:
+        - 1
+        - 1
+    - dependency_qrouter_volume_1:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_cdr_network_port:
+    - dependency_qrouter_volume_0:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_cdr_network_port:
-        capability: tosca.capabilities.network.Linkable
-        relationship: tosca.relationships.network.LinksTo
-        occurrences:
-        - 1
-        - 1
     - dependency_qrouter_volume_2:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
@@ -193,12 +193,6 @@ node_types:
         - 1
         - 1
     capabilities:
-      network.outgoing.bytes_cdr_network_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
       binding_QRouter1:
         type: tosca.capabilities.network.Bindable
         occurrences:
@@ -245,17 +239,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_cdr_network_port:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
-      network.incoming.packets_cdr_network_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.device.read.bytes.rate_QRouter1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -280,12 +263,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_cdr_network_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
       memory.resident_QRouter1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -305,11 +282,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      feature_cdr_network_port:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
       disk.device.write.bytes.rate_QRouter1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -322,9 +294,8 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_cdr_network_port:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_cdr_network_port_1:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
@@ -416,13 +387,13 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_cdr_network_port:
+      network.outgoing.bytes_oam_private_net_network_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_private_net_network_port:
+      network.incoming.packets.rate_cdr_network_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:
@@ -440,6 +411,17 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      network.incoming.packets_cdr_network_port_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      attachment_cdr_network_port_1:
+        type: tosca.capabilities.Attachment
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.write.requests.rate_QRouter1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -452,6 +434,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      network.outpoing.packets_cdr_network_port_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
       memory_QRouter1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -464,14 +452,15 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      scalable_QRouter1:
-        type: tosca.capabilities.Scalable
+      binding_cdr_network_port_1:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
         occurrences:
-        - 1
+        - 0
         - UNBOUNDED
-      network.outgoing.bytes.rate_cdr_network_port:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      scalable_QRouter1:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
@@ -482,7 +471,7 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-      network.incoming.packets.rate_cdr_network_port:
+      network.incoming.bytes_cdr_network_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:
@@ -512,6 +501,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      network.outgoing.bytes.rate_cdr_network_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
       os_QRouter1:
         type: tosca.capabilities.OperatingSystem
         occurrences:
@@ -535,26 +530,25 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      binding_cdr_network_port:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+      network.incoming.bytes.rate_cdr_network_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:
-        - 0
+        - 1
         - UNBOUNDED
-      disk.write.bytes.rate_QRouter1:
+      network.outgoing.bytes_cdr_network_port_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes_QRouter1:
+      disk.write.bytes.rate_QRouter1:
         type: org.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_cdr_network_port:
+      disk.device.write.bytes_QRouter1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -583,6 +577,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      network.outgoing.packets.rate_cdr_network_port_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.read.requests_QRouter1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -741,14 +741,14 @@ node_types:
         required: true
         status: SUPPORTED
     requirements:
-    - dependency_packet_mirror_network_port:
+    - dependency_packet_mirror_network_port_1:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_packet_mirror_network_port:
+    - link_packet_mirror_network_port_1:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
@@ -775,26 +775,26 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_oam_private_net_network_port:
+    - dependency_vLBAgent_volume_1:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_oam_private_net_network_port:
-        capability: tosca.capabilities.network.Linkable
-        relationship: tosca.relationships.network.LinksTo
-        occurrences:
-        - 1
-        - 1
-    - dependency_vLBAgent_volume_1:
+    - dependency_oam_private_net_network_port_3:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
+    - link_oam_private_net_network_port_3:
+        capability: tosca.capabilities.network.Linkable
+        relationship: tosca.relationships.network.LinksTo
+        occurrences:
+        - 1
+        - 1
     - dependency_vLBAgent_volume_2:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
@@ -816,14 +816,15 @@ node_types:
         - 1
         - 1
     capabilities:
-      disk.device.read.requests_vLBAgentInstance:
+      network.incoming.bytes.rate_packet_mirror_network_port_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_oam_private_net_network_port:
-        type: tosca.capabilities.Attachment
+      disk.device.read.requests_vLBAgentInstance:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
@@ -833,13 +834,19 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      network.outgoing.bytes.rate_oam_private_net_network_port_3:
+        type: org.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.usage_vLBAgentInstance:
         type: org.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_packet_mirror_network_port:
+      network.incoming.bytes.rate_oam_private_net_network_port_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -851,7 +858,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_oam_private_net_network_port:
+      network.incoming.packets_oam_private_net_network_port_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -863,9 +870,8 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_oam_private_net_network_port:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_oam_private_net_network_port_3:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
@@ -890,12 +896,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_packet_mirror_network_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.usage_vLBAgentInstance:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -914,53 +914,67 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      binding_packet_internal_network_port:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+      network.incoming.packets_packet_mirror_network_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:
-        - 0
+        - 1
         - UNBOUNDED
-      disk.device.write.bytes_vLBAgentInstance:
+      network.outgoing.bytes.rate_packet_mirror_network_port_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_oam_private_net_network_port:
+      network.outpoing.packets_oam_private_net_network_port_3:
         type: org.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_private_net_network_port:
-        type: tosca.capabilities.Node
+      binding_packet_internal_network_port:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
         occurrences:
-        - 1
+        - 0
         - UNBOUNDED
-      network.outpoing.packets_packet_mirror_network_port:
+      disk.device.write.bytes_vLBAgentInstance:
         type: org.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_packet_mirror_network_port:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      attachment_packet_mirror_network_port_1:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_packet_mirror_network_port:
+      network.incoming.packets.rate_oam_private_net_network_port_3:
         type: org.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_private_net_network_port_3:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
       endpoint_vLBAgentInstance:
         type: tosca.capabilities.Endpoint.Admin
         occurrences:
         - 1
         - UNBOUNDED
+      binding_packet_mirror_network_port_1:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
       binding_vLBAgentInstance:
         type: tosca.capabilities.network.Bindable
         occurrences:
@@ -983,114 +997,130 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_packet_mirror_network_port:
+      disk.read.bytes_vLBAgentInstance:
         type: org.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_packet_mirror_network_port:
+      memory.usage_vLBAgentInstance:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes_vLBAgentInstance:
+      scalable_vLBAgentInstance:
+        type: tosca.capabilities.Scalable
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.latency_vLBAgentInstance:
         type: org.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_vLBAgentInstance:
+      disk.device.allocation_vLBAgentInstance:
         type: org.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_private_net_network_port:
+      cpu_vLBAgentInstance:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      scalable_vLBAgentInstance:
-        type: tosca.capabilities.Scalable
+      disk.device.write.requests_vLBAgentInstance:
+        type: org.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_vLBAgentInstance:
+      disk.write.bytes_vLBAgentInstance:
         type: org.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_vLBAgentInstance:
+      memory_vLBAgentInstance:
         type: org.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_vLBAgentInstance:
+      disk.device.write.bytes.rate_vLBAgentInstance:
         type: org.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_vLBAgentInstance:
+      network.outgoing.packets.rate_packet_internal_network_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_vLBAgentInstance:
+      disk.iops_vLBAgentInstance:
         type: org.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_private_net_network_port:
+      network.outgoing.packets.rate_oam_private_net_network_port_3:
         type: org.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_vLBAgentInstance:
+      feature_packet_mirror_network_port_1:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      instance_vLBAgentInstance:
         type: org.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_vLBAgentInstance:
+      network.incoming.bytes_packet_mirror_network_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_packet_internal_network_port:
+      attachment_oam_private_net_network_port_3:
+        type: tosca.capabilities.Attachment
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.outgoing.bytes_packet_internal_network_port:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.iops_vLBAgentInstance:
+      network.outgoing.packets.rate_packet_mirror_network_port_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      instance_vLBAgentInstance:
+      network.incoming.bytes_packet_internal_network_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_packet_internal_network_port:
+      network.outpoing.packets_packet_mirror_network_port_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_packet_internal_network_port:
+      network.outgoing.bytes_packet_mirror_network_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:
@@ -1113,11 +1143,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_packet_mirror_network_port:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
       disk.write.requests.rate_vLBAgentInstance:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -1129,13 +1154,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      binding_oam_private_net_network_port:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        occurrences:
-        - 0
-        - UNBOUNDED
       disk.device.read.bytes_vLBAgentInstance:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -1165,43 +1183,25 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      feature_packet_mirror_network_port:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      binding_packet_mirror_network_port:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        occurrences:
-        - 0
-        - UNBOUNDED
-      network.incoming.packets_oam_private_net_network_port:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
-      network.incoming.bytes.rate_packet_mirror_network_port:
+      disk.device.read.bytes.rate_vLBAgentInstance:
         type: org.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_private_net_network_port:
+      network.outgoing.bytes_oam_private_net_network_port_3:
         type: org.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_vLBAgentInstance:
+      cpu.delta_vLBAgentInstance:
         type: org.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_vLBAgentInstance:
+      network.incoming.bytes_oam_private_net_network_port_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -1254,6 +1254,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      network.incoming.packets.rate_packet_mirror_network_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
       vcpus_vLBAgentInstance:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -1277,12 +1283,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_oam_private_net_network_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
   org.openecomp.resource.abstract.nodes.heat.FEAdd_On_Module_vLBTemplate:
     derived_from: org.openecomp.resource.abstract.nodes.AbstractSubstitute
     properties:
@@ -1421,66 +1421,66 @@ node_types:
         required: true
         status: SUPPORTED
     requirements:
-    - dependency_packet_mirror_network_port:
+    - dependency_packet_internal_network_port_2:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_packet_mirror_network_port:
+    - link_packet_internal_network_port_2:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
         - 1
         - 1
-    - dependency_vLB_volume_1:
+    - dependency_oam_private_net_network_port_2:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_vLB_volume_0:
+    - link_oam_private_net_network_port_2:
+        capability: tosca.capabilities.network.Linkable
+        relationship: tosca.relationships.network.LinksTo
+        occurrences:
+        - 1
+        - 1
+    - dependency_packet_mirror_network_port:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_vLB_volume_2:
+    - link_packet_mirror_network_port:
+        capability: tosca.capabilities.network.Linkable
+        relationship: tosca.relationships.network.LinksTo
+        occurrences:
+        - 1
+        - 1
+    - dependency_vLB_volume_1:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_oam_private_net_network_port:
+    - dependency_vLB_volume_0:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_oam_private_net_network_port:
-        capability: tosca.capabilities.network.Linkable
-        relationship: tosca.relationships.network.LinksTo
-        occurrences:
-        - 1
-        - 1
-    - dependency_packet_internal_network_port:
+    - dependency_vLB_volume_2:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_packet_internal_network_port:
-        capability: tosca.capabilities.network.Linkable
-        relationship: tosca.relationships.network.LinksTo
-        occurrences:
-        - 1
-        - 1
     - dependency_vLBInstance:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
@@ -1496,18 +1496,19 @@ node_types:
         - 0
         - UNBOUNDED
     capabilities:
-      attachment_oam_private_net_network_port:
-        type: tosca.capabilities.Attachment
+      disk.iops_vLBInstance:
+        type: org.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_packet_internal_network_port:
+      network.incoming.packets_packet_internal_network_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_vLBInstance:
+      network.outgoing.bytes.rate_oam_private_net_network_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:
@@ -1529,6 +1530,18 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      network.outgoing.bytes.rate_packet_internal_network_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.packets_oam_private_net_network_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.write.bytes.rate_vLBInstance:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -1541,7 +1554,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_oam_private_net_network_port:
+      network.incoming.bytes.rate_oam_private_net_network_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:
@@ -1553,7 +1566,18 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_oam_private_net_network_port:
+      feature_oam_private_net_network_port_2:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.outgoing.bytes_packet_internal_network_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.packets.rate_packet_internal_network_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:
@@ -1572,13 +1596,13 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_packet_internal_network_port:
+      network.outgoing.bytes.rate_packet_mirror_network_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.rate_packet_mirror_network_port:
+      network.outpoing.packets_packet_internal_network_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:
@@ -1590,20 +1614,19 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      binding_packet_internal_network_port:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+      network.outpoing.packets_oam_private_net_network_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:
-        - 0
+        - 1
         - UNBOUNDED
-      instance_vLBInstance:
+      network.incoming.packets.rate_oam_private_net_network_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_oam_private_net_network_port:
+      instance_vLBInstance:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -1614,10 +1637,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      feature_oam_private_net_network_port:
-        type: tosca.capabilities.Node
+      binding_oam_private_net_network_port_2:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
         occurrences:
-        - 1
+        - 0
         - UNBOUNDED
       disk.device.latency_vLBInstance:
         type: org.openecomp.capabilities.metric.Ceilometer
@@ -1631,6 +1656,13 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      binding_packet_internal_network_port_2:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
       network.incoming.bytes_packet_mirror_network_port:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -1649,11 +1681,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_packet_internal_network_port:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
       network.incoming.packets.rate_packet_mirror_network_port:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -1666,13 +1693,13 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_oam_private_net_network_port:
+      memory_vLBInstance:
         type: org.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_vLBInstance:
+      network.incoming.bytes.rate_packet_internal_network_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:
@@ -1690,12 +1717,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_oam_private_net_network_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.requests_vLBInstance:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -1719,21 +1740,20 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_packet_internal_network_port:
+      disk.capacity_vLBInstance:
         type: org.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_vLBInstance:
+      disk.device.read.bytes_vLBInstance:
         type: org.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_vLBInstance:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      attachment_packet_internal_network_port_2:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
@@ -1742,6 +1762,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      network.outgoing.packets.rate_oam_private_net_network_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_vLB_volume_1:
         type: tosca.capabilities.Attachment
         occurrences:
@@ -1765,12 +1791,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_packet_internal_network_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.requests.rate_vLBInstance:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -1783,15 +1803,14 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_packet_internal_network_port:
+      network.outgoing.packets.rate_packet_internal_network_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.packets.rate_packet_internal_network_port:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      attachment_oam_private_net_network_port_2:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
@@ -1806,13 +1825,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      binding_oam_private_net_network_port:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        occurrences:
-        - 0
-        - UNBOUNDED
       disk.device.read.requests_vLBInstance:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -1825,11 +1837,22 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      network.incoming.bytes_packet_internal_network_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_packet_mirror_network_port:
         type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
+      feature_packet_internal_network_port_2:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
       binding_packet_mirror_network_port:
         type: tosca.capabilities.network.Bindable
         valid_source_types:
@@ -1837,19 +1860,19 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-      network.incoming.packets_oam_private_net_network_port:
+      network.outgoing.bytes_oam_private_net_network_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.rate_packet_mirror_network_port:
+      network.incoming.bytes_oam_private_net_network_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.packets.rate_oam_private_net_network_port:
+      network.incoming.bytes.rate_packet_mirror_network_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:
@@ -1895,12 +1918,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_packet_internal_network_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_vLBInstance:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -1917,12 +1934,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_packet_internal_network_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.device.allocation_vLBInstance:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -1946,23 +1957,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      feature_packet_internal_network_port:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
       cpu_util_vLBInstance:
         type: org.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_private_net_network_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
   org.openecomp.resource.abstract.nodes.heat.FEAdd_On_Module_vProbeTemplate:
     derived_from: org.openecomp.resource.abstract.nodes.AbstractSubstitute
     properties:
@@ -2152,40 +2152,40 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_cdr_network_port:
+    - dependency_oam_private_net_network_port_1:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_cdr_network_port:
+    - link_oam_private_net_network_port_1:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
         - 1
         - 1
-    - dependency_oam_private_net_network_port:
+    - dependency_cdr_network_port:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_oam_private_net_network_port:
+    - link_cdr_network_port:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
         - 1
         - 1
-    - dependency_packet_internal_network_port:
+    - dependency_packet_internal_network_port_1:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_packet_internal_network_port:
+    - link_packet_internal_network_port_1:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
@@ -2210,18 +2210,31 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_oam_private_net_network_port:
-        type: tosca.capabilities.Attachment
+      disk.iops_ProbeInstance:
+        type: org.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_ProbeInstance:
+      network.incoming.packets_packet_internal_network_port_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_packet_internal_network_port:
+      network.outgoing.bytes.rate_oam_private_net_network_port_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.incoming.packets_oam_private_net_network_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_packet_internal_network_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:
@@ -2243,13 +2256,18 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_oam_private_net_network_port:
+      feature_oam_private_net_network_port_1:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.incoming.bytes.rate_oam_private_net_network_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_private_net_network_port:
+      network.outgoing.bytes_packet_internal_network_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:
@@ -2261,7 +2279,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_packet_internal_network_port:
+      network.incoming.packets.rate_packet_internal_network_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:
@@ -2278,12 +2296,24 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      network.outpoing.packets_packet_internal_network_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.rate_ProbeInstance:
         type: org.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_private_net_network_port_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.incoming.bytes_cdr_network_port:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -2297,34 +2327,31 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      binding_packet_internal_network_port:
+      network.incoming.packets.rate_oam_private_net_network_port_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      binding_oam_private_net_network_port_1:
         type: tosca.capabilities.network.Bindable
         valid_source_types:
         - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
         occurrences:
         - 0
         - UNBOUNDED
-      network.incoming.bytes_oam_private_net_network_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
       memory_ProbeInstance:
         type: org.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_private_net_network_port:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      attachment_packet_internal_network_port:
-        type: tosca.capabilities.Attachment
+      binding_packet_internal_network_port_1:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
         occurrences:
-        - 1
+        - 0
         - UNBOUNDED
       disk.device.read.requests_ProbeInstance:
         type: org.openecomp.capabilities.metric.Ceilometer
@@ -2332,12 +2359,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_oam_private_net_network_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
       memory.resident_ProbeInstance:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -2385,7 +2406,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_oam_private_net_network_port:
+      network.incoming.bytes.rate_packet_internal_network_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:
@@ -2397,24 +2418,29 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      attachment_packet_internal_network_port_1:
+        type: tosca.capabilities.Attachment
+        occurrences:
+        - 1
+        - UNBOUNDED
       endpoint_ProbeInstance:
         type: tosca.capabilities.Endpoint.Admin
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_packet_internal_network_port:
+      disk.ephemeral.size_ProbeInstance:
         type: org.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_ProbeInstance:
+      disk.read.bytes.rate_ProbeInstance:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes.rate_ProbeInstance:
+      network.outgoing.packets.rate_oam_private_net_network_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:
@@ -2431,15 +2457,14 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_packet_internal_network_port:
+      network.outgoing.packets.rate_packet_internal_network_port_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_packet_internal_network_port:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      attachment_oam_private_net_network_port_1:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
@@ -2484,12 +2509,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_packet_internal_network_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
       attachment_vprobe_volume_1:
         type: tosca.capabilities.Attachment
         occurrences:
@@ -2506,13 +2525,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      binding_oam_private_net_network_port:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        occurrences:
-        - 0
-        - UNBOUNDED
       binding_ProbeInstance:
         type: tosca.capabilities.network.Bindable
         occurrences:
@@ -2530,6 +2542,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      network.incoming.bytes_packet_internal_network_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.requests.rate_ProbeInstance:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -2552,9 +2570,8 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_oam_private_net_network_port:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_packet_internal_network_port_1:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
@@ -2563,7 +2580,13 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_oam_private_net_network_port:
+      network.outgoing.bytes_oam_private_net_network_port_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.incoming.bytes_oam_private_net_network_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:
@@ -2605,12 +2628,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_packet_internal_network_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
       binding_cdr_network_port:
         type: tosca.capabilities.network.Bindable
         valid_source_types:
@@ -2636,26 +2653,9 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_packet_internal_network_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
-      feature_packet_internal_network_port:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
       disk.device.read.bytes.rate_ProbeInstance:
         type: org.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_private_net_network_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
\ 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/securityrulestoportconnection/securityRulesToPortGetResource/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/MainServiceTemplate.yaml
index 7d2364e084..de4eb2c145 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/MainServiceTemplate.yaml
@@ -603,7 +603,7 @@ topology_template:
         rpmrepository_ip_0:
           get_input: rpmrepository_ip_0
       requirements:
-      - link_packet_mirror_network_port:
+      - link_packet_mirror_network_port_1:
           capability: tosca.capabilities.network.Linkable
           node: packet_mirror_network
           relationship: tosca.relationships.network.LinksTo
@@ -709,7 +709,7 @@ topology_template:
         rpmrepository_ip_0:
           get_input: rpmrepository_ip_0
       requirements:
-      - link_packet_internal_network_port:
+      - link_packet_internal_network_port_1:
           capability: tosca.capabilities.network.Linkable
           node: packet_internal_network
           relationship: tosca.relationships.network.LinksTo
@@ -833,15 +833,15 @@ topology_template:
           node: QRouter0
           relationship: org.openecomp.relationships.AttachesTo
       - port:
-          capability: attachment_cdr_network_port
+          capability: attachment_cdr_network_port_1
           node: QRouter0
           relationship: org.openecomp.relationships.AttachesTo
       - port:
-          capability: attachment_oam_private_net_network_port
+          capability: attachment_packet_internal_network_port_2
           node: vLB
           relationship: org.openecomp.relationships.AttachesTo
       - port:
-          capability: attachment_packet_internal_network_port
+          capability: attachment_oam_private_net_network_port_2
           node: vLB
           relationship: org.openecomp.relationships.AttachesTo
       - port:
@@ -849,7 +849,7 @@ topology_template:
           node: vLB
           relationship: org.openecomp.relationships.AttachesTo
       - port:
-          capability: attachment_oam_private_net_network_port
+          capability: attachment_packet_mirror_network_port_1
           node: vLBAgent
           relationship: org.openecomp.relationships.AttachesTo
       - port:
@@ -857,19 +857,19 @@ topology_template:
           node: vLBAgent
           relationship: org.openecomp.relationships.AttachesTo
       - port:
-          capability: attachment_packet_mirror_network_port
+          capability: attachment_oam_private_net_network_port_3
           node: vLBAgent
           relationship: org.openecomp.relationships.AttachesTo
       - port:
-          capability: attachment_oam_private_net_network_port
+          capability: attachment_cdr_network_port
           node: vProbe
           relationship: org.openecomp.relationships.AttachesTo
       - port:
-          capability: attachment_cdr_network_port
+          capability: attachment_packet_internal_network_port_1
           node: vProbe
           relationship: org.openecomp.relationships.AttachesTo
       - port:
-          capability: attachment_packet_internal_network_port
+          capability: attachment_oam_private_net_network_port_1
           node: vProbe
           relationship: org.openecomp.relationships.AttachesTo
     QRouter0:
@@ -1026,13 +1026,13 @@ topology_template:
         vLB_volume_size_2:
           get_input: vLB_volume_size_2
       requirements:
-      - link_packet_mirror_network_port:
+      - link_packet_internal_network_port_2:
           capability: tosca.capabilities.network.Linkable
-          node: packet_mirror_network
+          node: packet_internal_network
           relationship: tosca.relationships.network.LinksTo
-      - link_packet_internal_network_port:
+      - link_packet_mirror_network_port:
           capability: tosca.capabilities.network.Linkable
-          node: packet_internal_network
+          node: packet_mirror_network
           relationship: tosca.relationships.network.LinksTo
       - dependency:
           capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/sharedNestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/sharedNestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
index b2eb38f367..e73e81a437 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/sharedNestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/sharedNestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -69,14 +69,14 @@ node_types:
         occurrences:
         - 1
         - 1
-    - dependency_server_cmaui:
+    - dependency_server_cmaui_1:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - local_storage_server_cmaui:
+    - local_storage_server_cmaui_1:
         capability: tosca.capabilities.Attachment
         node: tosca.nodes.BlockStorage
         relationship: tosca.relationships.AttachesTo
@@ -103,6 +103,20 @@ node_types:
         occurrences:
         - 1
         - 1
+    - dependency_server_cmaui_2_test_nested2Level:
+        capability: tosca.capabilities.Node
+        node: tosca.nodes.Root
+        relationship: tosca.relationships.DependsOn
+        occurrences:
+        - 0
+        - UNBOUNDED
+    - local_storage_server_cmaui_2_test_nested2Level:
+        capability: tosca.capabilities.Attachment
+        node: tosca.nodes.BlockStorage
+        relationship: tosca.relationships.AttachesTo
+        occurrences:
+        - 0
+        - UNBOUNDED
     - dependency_cmaui_port_4_test_nested2Level:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
@@ -143,6 +157,20 @@ node_types:
         occurrences:
         - 1
         - 1
+    - dependency_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+        capability: tosca.capabilities.Node
+        node: tosca.nodes.Root
+        relationship: tosca.relationships.DependsOn
+        occurrences:
+        - 0
+        - UNBOUNDED
+    - local_storage_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+        capability: tosca.capabilities.Attachment
+        node: tosca.nodes.BlockStorage
+        relationship: tosca.relationships.AttachesTo
+        occurrences:
+        - 0
+        - UNBOUNDED
     - dependency_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
@@ -156,14 +184,14 @@ node_types:
         occurrences:
         - 1
         - 1
-    - dependency_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+    - dependency_server_cmaui_3_test_nested3Level_test_nested2Level:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - local_storage_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+    - local_storage_server_cmaui_3_test_nested3Level_test_nested2Level:
         capability: tosca.capabilities.Attachment
         node: tosca.nodes.BlockStorage
         relationship: tosca.relationships.AttachesTo
@@ -196,34 +224,6 @@ node_types:
         occurrences:
         - 1
         - 1
-    - dependency_server_cmaui_test_nested3Level_test_nested2Level:
-        capability: tosca.capabilities.Node
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.DependsOn
-        occurrences:
-        - 0
-        - UNBOUNDED
-    - local_storage_server_cmaui_test_nested3Level_test_nested2Level:
-        capability: tosca.capabilities.Attachment
-        node: tosca.nodes.BlockStorage
-        relationship: tosca.relationships.AttachesTo
-        occurrences:
-        - 0
-        - UNBOUNDED
-    - dependency_server_cmaui_test_nested2Level:
-        capability: tosca.capabilities.Node
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.DependsOn
-        occurrences:
-        - 0
-        - UNBOUNDED
-    - local_storage_server_cmaui_test_nested2Level:
-        capability: tosca.capabilities.Attachment
-        node: tosca.nodes.BlockStorage
-        relationship: tosca.relationships.AttachesTo
-        occurrences:
-        - 0
-        - UNBOUNDED
     - dependency_cmaui_port_1:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
@@ -238,24 +238,7 @@ node_types:
         - 1
         - 1
     capabilities:
-      os_server_cmaui_test_nested2Level:
-        type: tosca.capabilities.OperatingSystem
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.device.write.requests.rate_server_cmaui:
-        type: org.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_cmaui:
-        type: org.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_cmaui_test_nested3Level_test_nested2Level:
+      memory.resident_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -274,39 +257,38 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-      disk.ephemeral.size_server_cmaui_test_nested3Level_test_nested2Level:
+      memory.resident_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.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.usage_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.device.latency_server_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
-      host_server_cmaui:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
+      disk.device.latency_server_cmaui_3_test_nested3Level_test_nested2Level:
+        type: org.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_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.device.read.requests_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.root.size_server_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
-      feature_server_cmaui_test_nested2Level:
-        type: tosca.capabilities.Node
+      scalable_server_cmaui_3_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
@@ -316,8 +298,9 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      endpoint_server_cmaui_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.Endpoint.Admin
+      disk.read.requests_server_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
@@ -334,73 +317,89 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-      disk.device.write.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      endpoint_server_cmaui_2_test_nested2Level:
+        type: tosca.capabilities.Endpoint.Admin
+        occurrences:
+        - 1
+        - UNBOUNDED
+      binding_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.network.Bindable
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.latency_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.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_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      network.incoming.packets_cmaui_port_3_test_nested2Level:
         type: org.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_cmaui_port_3_test_nested2Level:
+      binding_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
+      disk.device.read.bytes.rate_server_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
-      feature_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      feature_server_cmaui_2_test_nested2Level:
         type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.root.size_server_cmaui_test_nested2Level:
+      disk.read.bytes_server_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
-      disk.write.requests_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.capacity_server_cmaui_2_test_nested2Level:
         type: org.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_8_test_nested4Level_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+      disk.write.bytes_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
-        - 0
+        - 1
         - UNBOUNDED
-      disk.root.size_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.device.read.bytes_server_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
-      disk.usage_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.device.write.requests_server_cmaui_2_test_nested2Level:
         type: org.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_cmaui:
+      disk.write.requests.rate_server_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
-      cpu.delta_server_cmaui_test_nested3Level_test_nested2Level:
+      network.incoming.packets.rate_cmaui_port_6_test_nested3Level_test_nested2Level:
         type: org.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_6_test_nested3Level_test_nested2Level:
+      disk.device.read.bytes_server_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -418,7 +417,19 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_server_cmaui_test_nested2Level:
+      cpu_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.write.requests.rate_server_cmaui_2_test_nested2Level:
+        type: org.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_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -441,12 +452,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      os_server_cmaui:
-        type: tosca.capabilities.OperatingSystem
-        occurrences:
-        - 1
-        - UNBOUNDED
-      memory.resident_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.read.bytes_server_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -459,52 +465,37 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-      os_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.OperatingSystem
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.device.read.requests.rate_server_cmaui_test_nested3Level_test_nested2Level:
+      network.incoming.bytes.rate_cmaui_port_4_test_nested2Level:
         type: org.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_cmaui_port_4_test_nested2Level:
+      network.incoming.bytes_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.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_cmaui_test_nested2Level:
+      disk.device.allocation_server_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      scalable_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.Scalable
-        occurrences:
-        - 1
-        - UNBOUNDED
-      instance_server_cmaui_test_nested2Level:
+      disk.ephemeral.size_server_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_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.device.read.bytes_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      endpoint_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.Endpoint.Admin
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.ephemeral.size_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.device.capacity_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -522,35 +513,24 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.allocation_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.read.bytes.rate_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.device.read.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.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_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.read.bytes_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.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_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      instance_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.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_cmaui:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
       binding_cmaui_port_1:
         type: tosca.capabilities.network.Bindable
         valid_source_types:
@@ -565,58 +545,48 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-      binding_server_cmaui_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.network.Bindable
-        occurrences:
-        - 1
-        - UNBOUNDED
       feature_test_nested2Level:
         type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      memory.usage_server_cmaui:
+      disk.write.requests_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.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_cmaui:
+      disk.device.write.requests_server_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
-      os_server_cmaui_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.OperatingSystem
-        occurrences:
-        - 1
-        - UNBOUNDED
-      network.incoming.packets_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
+      cpu_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.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_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.read.requests_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.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_cmaui_test_nested3Level_test_nested2Level:
+      network.incoming.packets_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.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_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.device.write.bytes.rate_server_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
-      disk.device.iops_server_cmaui:
+      cpu_util_server_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:
@@ -634,49 +604,49 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.iops_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      network.incoming.bytes_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.incoming.bytes_cmaui_port_1:
+      network.incoming.bytes_cmaui_port_5_test_nested3Level_test_nested2Level:
         type: org.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_5_test_nested3Level_test_nested2Level:
+      disk.write.bytes.rate_server_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.rate_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.device.write.bytes_server_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
-      disk.device.read.requests_server_cmaui_test_nested2Level:
+      disk.device.read.requests.rate_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.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:
+      network.outgoing.bytes.rate_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.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_2:
+      network.incoming.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
-      cpu_server_cmaui:
+      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:
@@ -698,274 +668,252 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes.rate_server_cmaui:
+      cpu_server_cmaui_2_test_nested2Level:
         type: org.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_cmaui_test_nested2Level:
+      disk.ephemeral.size_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.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_cmaui_test_nested2Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      binding_server_cmaui_1:
+        type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.latency_server_cmaui:
+      disk.root.size_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.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_cmaui:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      os_server_cmaui_3_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      disk.usage_server_cmaui:
+      disk.device.read.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.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.usage_server_cmaui:
+      cpu_util_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.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_server_cmaui:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      scalable_server_cmaui_1:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests.rate_server_cmaui:
+      disk.write.bytes_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.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_7_test_nested4Level_test_nested3Level_test_nested2Level:
+      memory_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.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_server_cmaui_test_nested2Level:
+      disk.device.write.bytes_server_cmaui_2_test_nested2Level:
         type: org.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_8_test_nested4Level_test_nested3Level_test_nested2Level:
+      network.incoming.packets.rate_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.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_server_cmaui:
+      network.outpoing.packets_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.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_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-        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_cmaui_1:
+        type: tosca.capabilities.Endpoint.Admin
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.iops_server_cmaui_test_nested3Level_test_nested2Level:
+      network.incoming.bytes.rate_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.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_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      os_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests.rate_server_cmaui_test_nested2Level:
+      disk.usage_server_cmaui_2_test_nested2Level:
         type: org.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_server_cmaui:
-        type: tosca.capabilities.network.Bindable
-        occurrences:
-        - 1
-        - UNBOUNDED
       network.outgoing.packets.rate_cmaui_port_4_test_nested2Level:
         type: org.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_cmaui:
+      disk.device.read.requests.rate_server_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      vcpus_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.read.bytes.rate_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.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_8_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.device.iops_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.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_7_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.device.allocation_server_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
-      disk.device.capacity_server_cmaui_test_nested3Level_test_nested2Level:
+      network.incoming.packets.rate_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.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_cmaui:
+      network.outpoing.packets_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      endpoint_server_cmaui_test_nested2Level:
-        type: tosca.capabilities.Endpoint.Admin
-        occurrences:
-        - 1
-        - UNBOUNDED
-      network.incoming.packets_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
+      memory_server_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
-      disk.write.bytes.rate_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.device.write.bytes_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.write.requests.rate_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.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_5_test_nested3Level_test_nested2Level:
+      network.incoming.packets_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.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_cmaui_test_nested3Level_test_nested2Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      os_server_cmaui_2_test_nested2Level:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes.rate_server_cmaui_test_nested2Level:
+      network.outgoing.bytes_cmaui_port_5_test_nested3Level_test_nested2Level:
         type: org.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_4_test_nested2Level:
+      disk.read.requests_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.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_3_test_nested2Level:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      network.outpoing.packets_cmaui_port_5_test_nested3Level_test_nested2Level:
+      vcpus_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.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_cmaui_test_nested3Level_test_nested2Level:
+      disk.device.capacity_server_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
-      memory.usage_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.device.iops_server_cmaui_2_test_nested2Level:
         type: org.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_3_test_nested2Level:
-        type: tosca.capabilities.Attachment
+      network.incoming.bytes_cmaui_port_4_test_nested2Level:
+        type: org.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_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.network.Bindable
+      feature_cmaui_port_3_test_nested2Level:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      vcpus_server_cmaui:
+      disk.read.bytes.rate_server_cmaui_2_test_nested2Level:
         type: org.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_server_cmaui:
+      network.outpoing.packets_cmaui_port_5_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes_server_cmaui_test_nested3Level_test_nested2Level:
+      instance_server_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
-      instance_server_cmaui_test_nested3Level_test_nested2Level:
+      instance_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.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_server_cmaui_test_nested2Level:
+      memory_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.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_cmaui:
-        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_port_3_test_nested2Level:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-        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_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.Endpoint.Admin
         occurrences:
         - 1
         - UNBOUNDED
@@ -981,59 +929,42 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.ephemeral.size_server_cmaui_test_nested2Level:
+      disk.device.read.requests_server_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
-      disk.device.read.bytes_server_cmaui_test_nested3Level_test_nested2Level:
+      cpu.delta_server_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
-      disk.device.allocation_server_cmaui_test_nested2Level:
-        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_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.iops_server_cmaui_test_nested2Level:
+      disk.device.read.bytes_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.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_server_cmaui_test_nested2Level:
-        type: tosca.capabilities.network.Bindable
-        occurrences:
-        - 1
-        - UNBOUNDED
       network.outgoing.bytes_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.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_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-        type: org.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_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.write.bytes.rate_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.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_cmaui:
+      disk.device.allocation_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -1044,7 +975,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.capacity_server_cmaui_test_nested2Level:
+      cpu_util_server_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -1055,47 +986,42 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests_server_cmaui_test_nested2Level:
+      memory.usage_server_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      scalable_server_cmaui:
-        type: tosca.capabilities.Scalable
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.read.bytes.rate_server_cmaui:
+      disk.device.usage_server_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
-      disk.device.usage_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.write.requests_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      scalable_server_cmaui_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.Scalable
+      feature_server_cmaui_3_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes_server_cmaui_test_nested2Level:
+      disk.device.read.requests_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.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_cmaui_test_nested3Level_test_nested2Level:
+      disk.root.size_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.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_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.device.write.requests.rate_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -1107,127 +1033,120 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.usage_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.device.write.requests.rate_server_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
-      cpu_util_server_cmaui:
+      disk.read.requests_server_cmaui_2_test_nested2Level:
         type: org.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_cmaui:
-        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_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests.rate_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.device.write.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.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_server_cmaui_test_nested2Level:
+      disk.write.bytes.rate_server_cmaui_2_test_nested2Level:
         type: org.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_cmaui_test_nested2Level:
+      disk.latency_server_cmaui_2_test_nested2Level:
         type: org.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_4_test_nested2Level:
+      vcpus_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.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.usage_server_cmaui_test_nested2Level:
+      disk.device.iops_server_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
-      disk.read.requests_server_cmaui_test_nested3Level_test_nested2Level:
+      network.outgoing.bytes_cmaui_port_4_test_nested2Level:
         type: org.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_cmaui:
+      disk.device.write.bytes_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.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_cmaui_port_5_test_nested3Level_test_nested2Level:
+      disk.device.usage_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.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_cmaui_test_nested3Level_test_nested2Level:
-        type: org.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_cmaui:
+      network.incoming.packets_cmaui_port_5_test_nested3Level_test_nested2Level:
         type: org.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_cmaui_test_nested3Level_test_nested2Level:
+      disk.capacity_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests.rate_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.device.write.bytes.rate_server_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      vcpus_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.device.read.requests_server_cmaui_2_test_nested2Level:
         type: org.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_server_cmaui_test_nested3Level_test_nested2Level:
+      cpu_server_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
-      disk.device.write.requests.rate_server_cmaui_test_nested2Level:
+      memory.resident_server_cmaui_2_test_nested2Level:
         type: org.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_cmaui_port_2:
+      disk.device.iops_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.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_cmaui:
+      disk.allocation_server_cmaui_2_test_nested2Level:
         type: org.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_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      network.incoming.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:
@@ -1245,62 +1164,60 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes_server_cmaui_test_nested2Level:
+      memory.usage_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests.rate_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.device.write.requests_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.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_cmaui_test_nested2Level:
+      disk.write.requests_server_cmaui_2_test_nested2Level:
         type: org.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_8_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.capacity_server_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.outpoing.packets_cmaui_port_3_test_nested2Level:
+      disk.read.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests.rate_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.write.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.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_server_cmaui_test_nested3Level_test_nested2Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      scalable_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
-      host_server_cmaui_test_nested2Level:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
+      network.outgoing.packets.rate_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: org.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_cmaui_port_6_test_nested3Level_test_nested2Level:
+      network.outpoing.packets_cmaui_port_3_test_nested2Level:
         type: org.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_server_cmaui_test_nested3Level_test_nested2Level:
+      network.incoming.packets_cmaui_port_6_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -1313,36 +1230,36 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-      disk.device.read.bytes.rate_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.allocation_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.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_4_test_nested2Level:
+      disk.device.read.bytes.rate_server_cmaui_2_test_nested2Level:
         type: org.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_test_nested4Level_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.Node
+      network.incoming.packets.rate_cmaui_port_4_test_nested2Level:
+        type: org.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_cmaui_test_nested2Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.iops_server_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
-      vcpus_server_cmaui_test_nested2Level:
+      disk.device.usage_server_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -1353,19 +1270,19 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes.rate_server_cmaui_test_nested3Level_test_nested2Level:
+      cpu.delta_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.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_port_2:
+      disk.device.write.bytes.rate_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.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_cmaui_test_nested2Level:
+      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:
@@ -1382,142 +1299,140 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      memory.usage_server_cmaui_test_nested2Level:
+      network.outgoing.packets.rate_cmaui_port_5_test_nested3Level_test_nested2Level:
         type: org.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_cmaui:
+      network.outgoing.bytes.rate_cmaui_port_4_test_nested2Level:
         type: org.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_5_test_nested3Level_test_nested2Level:
-        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_cmaui_3_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.Endpoint.Admin
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_cmaui_port_4_test_nested2Level:
+      binding_server_cmaui_3_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.network.Bindable
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.ephemeral.size_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes_server_cmaui:
+      disk.iops_server_cmaui_2_test_nested2Level:
         type: org.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_cmaui_test_nested2Level:
+      disk.write.bytes_server_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
-      feature_server_cmaui_test_nested3Level_test_nested2Level:
+      feature_server_cmaui_1:
         type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      memory_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.allocation_server_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
-      cpu_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.iops_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.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_server_cmaui:
+      network.outgoing.bytes_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.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_cmaui_test_nested3Level_test_nested2Level:
-        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_port_2:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      instance_server_cmaui_2_test_nested2Level:
         type: org.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_8_test_nested4Level_test_nested3Level_test_nested2Level:
+      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
-      disk.device.read.requests.rate_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      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_2:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.device.capacity_server_cmaui:
+      network.incoming.packets.rate_cmaui_port_3_test_nested2Level:
         type: org.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_1:
+      disk.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.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.
+      attachment_cmaui_port_1:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_cmaui_port_3_test_nested2Level:
+      network.outgoing.packets.rate_cmaui_port_3_test_nested2Level:
         type: org.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
+      network.outgoing.bytes.rate_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: org.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_server_cmaui_test_nested2Level:
+      disk.write.requests_server_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.packets.rate_cmaui_port_3_test_nested2Level:
+      disk.read.bytes_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.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_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
+      cpu.delta_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.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_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.usage_server_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:
@@ -1529,30 +1444,36 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      memory_server_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.usage_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.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_server_cmaui:
+      disk.device.allocation_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      scalable_server_cmaui_test_nested2Level:
-        type: tosca.capabilities.Scalable
+      os_server_cmaui_1:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      disk.usage_server_cmaui_test_nested2Level:
+      disk.device.latency_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: org.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_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -1574,19 +1495,31 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.capacity_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      cpu_util_server_cmaui_3_test_nested3Level_test_nested2Level:
+        type: org.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_cmaui_2_test_nested2Level:
+        type: org.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_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.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_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.ephemeral.size_server_cmaui_2_test_nested2Level:
         type: org.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_cmaui_test_nested2Level:
+      disk.usage_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -1598,25 +1531,42 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      host_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      host_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: tosca.capabilities.Container
         valid_source_types:
         - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
-      feature_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.Node
+      disk.capacity_server_cmaui_3_test_nested3Level_test_nested2Level:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      host_server_cmaui_test_nested3Level_test_nested2Level:
+      host_server_cmaui_1:
         type: tosca.capabilities.Container
         valid_source_types:
         - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
+      feature_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      binding_server_cmaui_2_test_nested2Level:
+        type: tosca.capabilities.network.Bindable
+        occurrences:
+        - 1
+        - UNBOUNDED
+      cpu.delta_server_cmaui_2_test_nested2Level:
+        type: org.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_4_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -1630,37 +1580,49 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-      disk.device.write.requests_server_cmaui_test_nested2Level:
+      disk.device.capacity_server_cmaui_2_test_nested2Level:
         type: org.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_cmaui:
+      disk.device.write.requests_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes.rate_server_cmaui_test_nested2Level:
+      memory.usage_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.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_cmaui:
+      scalable_server_cmaui_2_test_nested2Level:
+        type: tosca.capabilities.Scalable
+        occurrences:
+        - 1
+        - UNBOUNDED
+      host_server_cmaui_3_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.iops_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.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_cmaui_test_nested2Level:
+      vcpus_server_cmaui_2_test_nested2Level:
         type: org.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_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.device.read.requests.rate_server_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:
@@ -1684,13 +1646,25 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests_server_cmaui:
+      disk.device.read.bytes.rate_server_cmaui_3_test_nested3Level_test_nested2Level:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      vcpus_server_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
-      cpu.delta_server_cmaui_test_nested2Level:
+      disk.write.requests.rate_server_cmaui_2_test_nested2Level:
+        type: org.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_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -1706,13 +1680,25 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      disk.device.usage_server_cmaui_3_test_nested3Level_test_nested2Level:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.read.bytes.rate_server_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.rate_cmaui_port_3_test_nested2Level:
         type: org.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_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.device.capacity_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -1724,18 +1710,32 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      endpoint_server_cmaui:
-        type: tosca.capabilities.Endpoint.Admin
+      memory.resident_server_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
+      disk.device.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: org.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_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.latency_server_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
-      disk.allocation_server_cmaui_test_nested3Level_test_nested2Level:
+      host_server_cmaui_2_test_nested2Level:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
+        occurrences:
+        - 1
+        - UNBOUNDED
+      memory.usage_server_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:
@@ -1805,6 +1805,20 @@ node_types:
         occurrences:
         - 1
         - 1
+    - dependency_server_cmaui_2:
+        capability: tosca.capabilities.Node
+        node: tosca.nodes.Root
+        relationship: tosca.relationships.DependsOn
+        occurrences:
+        - 0
+        - UNBOUNDED
+    - local_storage_server_cmaui_2:
+        capability: tosca.capabilities.Attachment
+        node: tosca.nodes.BlockStorage
+        relationship: tosca.relationships.AttachesTo
+        occurrences:
+        - 0
+        - UNBOUNDED
     - dependency_cmaui_port_4:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
@@ -1845,6 +1859,20 @@ node_types:
         occurrences:
         - 1
         - 1
+    - dependency_server_cmaui_4_test_nested4Level_test_nested3Level:
+        capability: tosca.capabilities.Node
+        node: tosca.nodes.Root
+        relationship: tosca.relationships.DependsOn
+        occurrences:
+        - 0
+        - UNBOUNDED
+    - local_storage_server_cmaui_4_test_nested4Level_test_nested3Level:
+        capability: tosca.capabilities.Attachment
+        node: tosca.nodes.BlockStorage
+        relationship: tosca.relationships.AttachesTo
+        occurrences:
+        - 0
+        - UNBOUNDED
     - dependency_cmaui_port_8_test_nested4Level_test_nested3Level:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
@@ -1858,14 +1886,14 @@ node_types:
         occurrences:
         - 1
         - 1
-    - dependency_server_cmaui_test_nested4Level_test_nested3Level:
+    - dependency_server_cmaui_3_test_nested3Level:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - local_storage_server_cmaui_test_nested4Level_test_nested3Level:
+    - local_storage_server_cmaui_3_test_nested3Level:
         capability: tosca.capabilities.Attachment
         node: tosca.nodes.BlockStorage
         relationship: tosca.relationships.AttachesTo
@@ -1898,161 +1926,109 @@ node_types:
         occurrences:
         - 1
         - 1
-    - dependency_server_cmaui_test_nested3Level:
-        capability: tosca.capabilities.Node
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.DependsOn
-        occurrences:
-        - 0
-        - UNBOUNDED
-    - local_storage_server_cmaui_test_nested3Level:
-        capability: tosca.capabilities.Attachment
-        node: tosca.nodes.BlockStorage
-        relationship: tosca.relationships.AttachesTo
-        occurrences:
-        - 0
-        - UNBOUNDED
-    - dependency_server_cmaui:
-        capability: tosca.capabilities.Node
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.DependsOn
-        occurrences:
-        - 0
-        - UNBOUNDED
-    - local_storage_server_cmaui:
-        capability: tosca.capabilities.Attachment
-        node: tosca.nodes.BlockStorage
-        relationship: tosca.relationships.AttachesTo
-        occurrences:
-        - 0
-        - UNBOUNDED
     capabilities:
-      cpu.delta_server_cmaui:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.device.write.requests.rate_server_cmaui:
+      instance_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.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_server_cmaui_test_nested4Level_test_nested3Level:
+      memory.usage_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      vcpus_server_cmaui_test_nested3Level:
+      cpu_util_server_cmaui_3_test_nested3Level:
         type: org.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_cmaui:
+      disk.device.usage_server_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.latency_server_cmaui_test_nested3Level:
+      disk.device.usage_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.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_cmaui_test_nested4Level_test_nested3Level:
+      disk.device.latency_server_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
-      scalable_server_cmaui:
-        type: tosca.capabilities.Scalable
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.read.bytes.rate_server_cmaui:
+      network.incoming.bytes_cmaui_port_7_test_nested4Level_test_nested3Level:
         type: org.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_cmaui_test_nested4Level_test_nested3Level:
+      disk.usage_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.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_7_test_nested4Level_test_nested3Level:
+      disk.root.size_server_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.capacity_server_cmaui_test_nested4Level_test_nested3Level:
+      disk.device.write.requests.rate_server_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
-      host_server_cmaui:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
-        occurrences:
-        - 1
-        - UNBOUNDED
-      cpu_util_server_cmaui:
+      disk.read.requests_server_cmaui_3_test_nested3Level:
         type: org.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_cmaui_test_nested3Level:
-        type: tosca.capabilities.OperatingSystem
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.device.read.bytes_server_cmaui_test_nested4Level_test_nested3Level:
+      disk.latency_server_cmaui_3_test_nested3Level:
         type: org.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_server_cmaui_test_nested4Level_test_nested3Level:
+      disk.write.bytes.rate_server_cmaui_3_test_nested3Level:
         type: org.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_cmaui_test_nested4Level_test_nested3Level:
+      network.outgoing.bytes_cmaui_port_3:
         type: org.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_3:
-        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_cmaui_4_test_nested4Level_test_nested3Level:
+        type: tosca.capabilities.Endpoint.Admin
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests_server_cmaui:
+      disk.read.requests_server_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
-      instance_server_cmaui_test_nested4Level_test_nested3Level:
+      cpu_util_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.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_cmaui_test_nested3Level:
+      disk.write.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -2063,26 +2039,27 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes_server_cmaui_test_nested3Level:
+      network.outgoing.bytes.rate_cmaui_port_8_test_nested4Level_test_nested3Level:
         type: org.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_cmaui_test_nested4Level_test_nested3Level:
+      disk.device.iops_server_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.outgoing.bytes.rate_cmaui_port_8_test_nested4Level_test_nested3Level:
+      disk.device.write.bytes_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.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_cmaui_test_nested3Level:
-        type: tosca.capabilities.Node
+      disk.device.capacity_server_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
@@ -2091,191 +2068,191 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      memory.usage_server_cmaui_test_nested3Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      host_server_cmaui_4_test_nested4Level_test_nested3Level:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
-      instance_server_cmaui:
+      disk.device.read.bytes.rate_server_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.read.bytes_server_cmaui:
+      disk.ephemeral.size_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.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_server_cmaui_test_nested3Level:
-        type: tosca.capabilities.network.Bindable
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.root.size_server_cmaui:
+      disk.read.bytes_server_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
-      memory_server_cmaui_test_nested3Level:
+      disk.device.read.bytes_server_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.outgoing.bytes.rate_cmaui_port_5_test_nested3Level:
+      disk.device.capacity_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.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_cmaui_port_3:
+      disk.root.size_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.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_cmaui:
-        type: tosca.capabilities.OperatingSystem
+      disk.write.requests.rate_server_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_cmaui:
+      disk.iops_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.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_cmaui_port_4:
+      network.outgoing.bytes.rate_cmaui_port_5_test_nested3Level:
         type: org.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_cmaui_test_nested4Level_test_nested3Level:
+      memory_server_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.outgoing.bytes_cmaui_port_6_test_nested3Level:
+      cpu_server_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.outgoing.bytes_cmaui_port_7_test_nested4Level_test_nested3Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      host_server_cmaui_3_test_nested3Level:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
-      disk.ephemeral.size_server_cmaui_test_nested3Level:
+      network.incoming.packets_cmaui_port_3:
         type: org.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_6_test_nested3Level:
+      disk.allocation_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests.rate_server_cmaui_test_nested4Level_test_nested3Level:
+      memory_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.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_5_test_nested3Level:
+      network.incoming.packets_cmaui_port_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      vcpus_server_cmaui_test_nested4Level_test_nested3Level:
+      network.outgoing.bytes_cmaui_port_6_test_nested3Level:
         type: org.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_cmaui_port_6_test_nested3Level:
+      network.outgoing.bytes_cmaui_port_7_test_nested4Level_test_nested3Level:
         type: org.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_cmaui_test_nested3Level:
+      network.incoming.packets.rate_cmaui_port_6_test_nested3Level:
         type: org.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_8_test_nested4Level_test_nested3Level:
+      disk.ephemeral.size_server_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
-      endpoint_server_cmaui_test_nested4Level_test_nested3Level:
-        type: tosca.capabilities.Endpoint.Admin
+      cpu.delta_server_cmaui_4_test_nested4Level_test_nested3Level:
+        type: org.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_port_6_test_nested3Level:
+      disk.write.requests_server_cmaui_3_test_nested3Level:
         type: org.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_cmaui_test_nested3Level:
+      network.outpoing.packets_cmaui_port_5_test_nested3Level:
         type: org.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_cmaui_test_nested3Level:
+      disk.capacity_server_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.ephemeral.size_server_cmaui_test_nested4Level_test_nested3Level:
+      network.incoming.packets_cmaui_port_6_test_nested3Level:
         type: org.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_cmaui_test_nested3Level:
+      network.incoming.bytes_cmaui_port_8_test_nested4Level_test_nested3Level:
         type: org.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_cmaui_test_nested3Level:
+      network.outgoing.bytes.rate_cmaui_port_6_test_nested3Level:
         type: org.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_server_cmaui_test_nested3Level:
+      disk.read.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests_server_cmaui_test_nested4Level_test_nested3Level:
+      disk.read.bytes.rate_server_cmaui_3_test_nested3Level:
         type: org.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_cmaui:
-        type: tosca.capabilities.Node
+      disk.device.iops_server_cmaui_4_test_nested4Level_test_nested3Level:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
@@ -2286,7 +2263,7 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-      disk.device.read.bytes.rate_server_cmaui_test_nested3Level:
+      disk.iops_server_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:
@@ -2299,24 +2276,7 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-      disk.device.write.requests_server_cmaui_test_nested4Level_test_nested3Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
-      endpoint_server_cmaui_test_nested3Level:
-        type: tosca.capabilities.Endpoint.Admin
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.device.write.requests_server_cmaui_test_nested3Level:
-        type: org.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_cmaui:
+      disk.device.write.requests_server_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:
@@ -2332,7 +2292,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.ephemeral.size_server_cmaui:
+      memory_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -2344,19 +2304,24 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      memory_server_cmaui_test_nested4Level_test_nested3Level:
+      feature_server_cmaui_3_test_nested3Level:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.outgoing.bytes.rate_cmaui_port_3:
         type: org.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_port_3:
+      disk.device.write.bytes.rate_server_cmaui_3_test_nested3Level:
         type: org.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.usage_server_cmaui_test_nested3Level:
+      disk.root.size_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -2375,19 +2340,24 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-      disk.iops_server_cmaui:
+      disk.usage_server_cmaui_3_test_nested3Level:
         type: org.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_4:
+      os_server_cmaui_4_test_nested4Level_test_nested3Level:
+        type: tosca.capabilities.OperatingSystem
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.write.requests_server_cmaui_3_test_nested3Level:
         type: org.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_cmaui_test_nested4Level_test_nested3Level:
+      network.incoming.bytes_cmaui_port_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -2399,194 +2369,208 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.iops_server_cmaui:
+      disk.device.read.requests.rate_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes_server_cmaui:
+      disk.device.latency_server_cmaui_3_test_nested3Level:
         type: org.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_cmaui_test_nested3Level:
+      cpu_util_server_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.outgoing.bytes_cmaui_port_8_test_nested4Level_test_nested3Level:
+      memory.usage_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.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_8_test_nested4Level_test_nested3Level:
+      disk.device.write.requests.rate_server_cmaui_3_test_nested3Level:
         type: org.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_cmaui_test_nested4Level_test_nested3Level:
+      network.outgoing.bytes_cmaui_port_8_test_nested4Level_test_nested3Level:
         type: org.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_7_test_nested4Level_test_nested3Level:
-        type: tosca.capabilities.Node
+      disk.device.write.bytes.rate_server_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
-      cpu_server_cmaui:
+      disk.write.bytes.rate_server_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.packets.rate_cmaui_port_3:
+      disk.device.read.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.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_3:
-        type: tosca.capabilities.Node
+      vcpus_server_cmaui_4_test_nested4Level_test_nested3Level:
+        type: org.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_4:
+      network.outpoing.packets_cmaui_port_8_test_nested4Level_test_nested3Level:
         type: org.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_4:
-        type: tosca.capabilities.Node
+      disk.device.write.bytes_server_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
-      attachment_cmaui_port_6_test_nested3Level:
-        type: tosca.capabilities.Attachment
+      feature_cmaui_port_7_test_nested4Level_test_nested3Level:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes.rate_server_cmaui:
+      disk.iops_server_cmaui_3_test_nested3Level:
         type: org.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_server_cmaui_test_nested4Level_test_nested3Level:
+      network.incoming.packets.rate_cmaui_port_3:
         type: org.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_6_test_nested3Level:
+      cpu_server_cmaui_3_test_nested3Level:
         type: org.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_server_cmaui:
-        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_port_3:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_4:
+      disk.write.bytes_server_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.write.requests.rate_server_cmaui_test_nested3Level:
+      network.incoming.packets.rate_cmaui_port_4:
         type: org.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_3:
-        type: tosca.capabilities.Attachment
+      feature_server_cmaui_2:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes_server_cmaui_test_nested4Level_test_nested3Level:
-        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_port_4:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_cmaui_port_4:
+      attachment_cmaui_port_6_test_nested3Level:
         type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      disk.iops_server_cmaui_test_nested3Level:
+      network.outgoing.packets.rate_cmaui_port_6_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      host_server_cmaui_test_nested4Level_test_nested3Level:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
+      disk.allocation_server_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.latency_server_cmaui:
+      disk.device.allocation_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.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_cmaui:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      binding_server_cmaui_2:
+        type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.allocation_server_cmaui_test_nested3Level:
+      vcpus_server_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.read.requests_server_cmaui_test_nested4Level_test_nested3Level:
+      network.outgoing.packets.rate_cmaui_port_4:
         type: org.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_cmaui:
+      instance_server_cmaui_3_test_nested3Level:
         type: org.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_cmaui:
+      attachment_cmaui_port_3:
+        type: tosca.capabilities.Attachment
+        occurrences:
+        - 1
+        - UNBOUNDED
+      attachment_cmaui_port_4:
+        type: tosca.capabilities.Attachment
+        occurrences:
+        - 1
+        - UNBOUNDED
+      scalable_server_cmaui_2:
+        type: tosca.capabilities.Scalable
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.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_3:
+      disk.capacity_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.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.usage_server_cmaui:
+      network.outgoing.packets.rate_cmaui_port_3:
         type: org.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_cmaui_test_nested3Level:
+      disk.device.read.bytes.rate_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -2598,41 +2582,47 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.allocation_server_cmaui_test_nested4Level_test_nested3Level:
+      disk.write.requests_server_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.capacity_server_cmaui:
+      memory.resident_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests.rate_server_cmaui:
+      network.outpoing.packets_cmaui_port_7_test_nested4Level_test_nested3Level:
         type: org.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_cmaui_test_nested4Level_test_nested3Level:
-        type: tosca.capabilities.OperatingSystem
+      disk.usage_server_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.outpoing.packets_cmaui_port_7_test_nested4Level_test_nested3Level:
+      disk.device.usage_server_cmaui_3_test_nested3Level:
         type: org.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_cmaui_test_nested3Level:
+      disk.write.bytes_server_cmaui_3_test_nested3Level:
         type: org.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_cmaui_4_test_nested4Level_test_nested3Level:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.incoming.bytes.rate_cmaui_port_8_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -2646,39 +2636,42 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-      disk.root.size_server_cmaui_test_nested4Level_test_nested3Level:
+      disk.write.requests.rate_server_cmaui_3_test_nested3Level:
         type: org.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_server_cmaui:
+      disk.device.read.bytes_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
+      endpoint_server_cmaui_2:
+        type: tosca.capabilities.Endpoint.Admin
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.incoming.bytes_cmaui_port_6_test_nested3Level:
         type: org.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_server_cmaui:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      os_server_cmaui_2:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level:
+      disk.read.requests_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.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_cmaui_test_nested3Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      scalable_server_cmaui_4_test_nested4Level_test_nested3Level:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
@@ -2688,217 +2681,193 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      binding_server_cmaui:
-        type: tosca.capabilities.network.Bindable
+      attachment_cmaui_port_5_test_nested3Level:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.usage_server_cmaui_test_nested4Level_test_nested3Level:
+      disk.device.allocation_server_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.read.requests.rate_server_cmaui_test_nested4Level_test_nested3Level:
+      network.incoming.packets_cmaui_port_7_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests.rate_server_cmaui_test_nested4Level_test_nested3Level:
+      disk.device.latency_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.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_5_test_nested3Level:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.device.read.requests.rate_server_cmaui:
+      disk.read.bytes_server_cmaui_3_test_nested3Level:
         type: org.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_cmaui_test_nested4Level_test_nested3Level:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      binding_server_cmaui_test_nested4Level_test_nested3Level:
-        type: tosca.capabilities.network.Bindable
-        occurrences:
-        - 1
-        - UNBOUNDED
-      network.incoming.packets_cmaui_port_7_test_nested4Level_test_nested3Level:
+      disk.latency_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes_server_cmaui_test_nested4Level_test_nested3Level:
+      disk.device.allocation_server_cmaui_3_test_nested3Level:
         type: org.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_cmaui:
+      network.incoming.bytes.rate_cmaui_port_5_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      host_server_cmaui_test_nested3Level:
+      host_server_cmaui_2:
         type: tosca.capabilities.Container
         valid_source_types:
         - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
-      scalable_server_cmaui_test_nested4Level_test_nested3Level:
-        type: tosca.capabilities.Scalable
+      os_server_cmaui_3_test_nested3Level:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_cmaui_port_5_test_nested3Level:
+      disk.read.bytes_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.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_cmaui_port_8_test_nested4Level_test_nested3Level:
+      disk.write.requests_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.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_test_nested3Level:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.device.write.bytes_server_cmaui_test_nested3Level:
+      network.incoming.packets_cmaui_port_8_test_nested4Level_test_nested3Level:
         type: org.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_8_test_nested4Level_test_nested3Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      binding_server_cmaui_3_test_nested3Level:
+        type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_cmaui_port_8_test_nested4Level_test_nested3Level:
-        type: tosca.capabilities.Attachment
+      feature_test_nested3Level:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes.rate_server_cmaui_test_nested3Level:
+      network.outgoing.packets.rate_cmaui_port_8_test_nested4Level_test_nested3Level:
         type: org.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_cmaui_test_nested3Level:
+      cpu_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests.rate_server_cmaui_test_nested3Level:
+      cpu.delta_server_cmaui_3_test_nested3Level:
         type: org.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_server_cmaui_test_nested3Level:
+      disk.device.capacity_server_cmaui_3_test_nested3Level:
         type: org.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_cmaui_test_nested4Level_test_nested3Level:
+      disk.device.write.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.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_port_7_test_nested4Level_test_nested3Level:
-        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_port_8_test_nested4Level_test_nested3Level:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      memory.resident_server_cmaui:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      scalable_server_cmaui_3_test_nested3Level:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_cmaui_port_5_test_nested3Level:
+      instance_server_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.allocation_server_cmaui_test_nested4Level_test_nested3Level:
+      disk.device.iops_server_cmaui_3_test_nested3Level:
         type: org.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_7_test_nested4Level_test_nested3Level:
+      network.outgoing.bytes.rate_cmaui_port_7_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests_server_cmaui_test_nested3Level:
+      network.incoming.bytes_cmaui_port_5_test_nested3Level:
         type: org.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_cmaui:
-        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_cmaui_3_test_nested3Level:
+        type: tosca.capabilities.Endpoint.Admin
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_cmaui_port_6_test_nested3Level:
+      vcpus_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      vcpus_server_cmaui:
+      network.incoming.packets.rate_cmaui_port_7_test_nested4Level_test_nested3Level:
         type: org.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_4:
+      disk.allocation_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.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_7_test_nested4Level_test_nested3Level:
+      network.outpoing.packets_cmaui_port_6_test_nested3Level:
         type: org.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_server_cmaui:
+      network.outgoing.bytes_cmaui_port_4:
         type: org.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_cmaui_test_nested3Level:
+      network.outgoing.packets.rate_cmaui_port_7_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -2923,49 +2892,61 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      disk.device.write.bytes_server_cmaui_3_test_nested3Level:
+        type: org.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_5_test_nested3Level:
         type: org.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_cmaui_test_nested4Level_test_nested3Level:
+      disk.device.read.requests_server_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.allocation_server_cmaui:
+      disk.device.read.requests_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests_server_cmaui:
+      disk.read.bytes.rate_server_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
-      cpu_server_cmaui_test_nested3Level:
+      network.outpoing.packets_cmaui_port_3:
         type: org.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_cmaui_test_nested3Level:
+      disk.device.write.requests_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.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_cmaui_test_nested3Level:
+      disk.capacity_server_cmaui_3_test_nested3Level:
         type: org.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_3:
+      cpu.delta_server_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.read.requests.rate_server_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:
@@ -2977,12 +2958,29 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      binding_server_cmaui_4_test_nested4Level_test_nested3Level:
+        type: tosca.capabilities.network.Bindable
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.incoming.bytes.rate_cmaui_port_7_test_nested4Level_test_nested3Level:
         type: org.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_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.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
+        type: org.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_8_test_nested4Level_test_nested3Level:
         type: tosca.capabilities.network.Bindable
         valid_source_types:
@@ -2990,13 +2988,15 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-      scalable_server_cmaui_test_nested3Level:
-        type: tosca.capabilities.Scalable
+      disk.write.bytes_server_cmaui_4_test_nested4Level_test_nested3Level:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      endpoint_server_cmaui:
-        type: tosca.capabilities.Endpoint.Admin
+      disk.device.read.requests_server_cmaui_3_test_nested3Level:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
@@ -3005,49 +3005,49 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      cpu.delta_server_cmaui_test_nested4Level_test_nested3Level:
+      network.incoming.packets_cmaui_port_5_test_nested3Level:
         type: org.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_cmaui_port_5_test_nested3Level:
+      disk.latency_server_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.iops_server_cmaui_test_nested4Level_test_nested3Level:
+      disk.ephemeral.size_server_cmaui_3_test_nested3Level:
         type: org.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_server_cmaui_test_nested3Level:
+      network.outgoing.packets.rate_cmaui_port_5_test_nested3Level:
         type: org.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_cmaui_test_nested3Level:
+      disk.device.read.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.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_cmaui_test_nested4Level_test_nested3Level:
+      disk.device.read.bytes_server_cmaui_3_test_nested3Level:
         type: org.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_5_test_nested3Level:
+      memory.resident_server_cmaui_3_test_nested3Level:
         type: org.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_cmaui_test_nested4Level_test_nested3Level:
+      memory.usage_server_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:
@@ -3127,6 +3127,20 @@ node_types:
         occurrences:
         - 1
         - 1
+    - dependency_server_cmaui_4_test_nested4Level:
+        capability: tosca.capabilities.Node
+        node: tosca.nodes.Root
+        relationship: tosca.relationships.DependsOn
+        occurrences:
+        - 0
+        - UNBOUNDED
+    - local_storage_server_cmaui_4_test_nested4Level:
+        capability: tosca.capabilities.Attachment
+        node: tosca.nodes.BlockStorage
+        relationship: tosca.relationships.AttachesTo
+        occurrences:
+        - 0
+        - UNBOUNDED
     - dependency_cmaui_port_8_test_nested4Level:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
@@ -3140,14 +3154,14 @@ node_types:
         occurrences:
         - 1
         - 1
-    - dependency_server_cmaui_test_nested4Level:
+    - dependency_server_cmaui_3:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - local_storage_server_cmaui_test_nested4Level:
+    - local_storage_server_cmaui_3:
         capability: tosca.capabilities.Attachment
         node: tosca.nodes.BlockStorage
         relationship: tosca.relationships.AttachesTo
@@ -3180,245 +3194,251 @@ node_types:
         occurrences:
         - 1
         - 1
-    - dependency_server_cmaui:
-        capability: tosca.capabilities.Node
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.DependsOn
-        occurrences:
-        - 0
-        - UNBOUNDED
-    - local_storage_server_cmaui:
-        capability: tosca.capabilities.Attachment
-        node: tosca.nodes.BlockStorage
-        relationship: tosca.relationships.AttachesTo
+    capabilities:
+      memory.usage_server_cmaui_4_test_nested4Level:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
-        - 0
+        - 1
         - UNBOUNDED
-    capabilities:
-      cpu.delta_server_cmaui:
+      cpu_util_server_cmaui_4_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests.rate_server_cmaui:
+      disk.device.usage_server_cmaui_3:
         type: org.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_cmaui:
+      disk.device.latency_server_cmaui_3:
         type: org.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_server_cmaui_test_nested4Level:
+      disk.read.requests_server_cmaui_4_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      scalable_server_cmaui:
-        type: tosca.capabilities.Scalable
+      disk.root.size_server_cmaui_3:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes.rate_server_cmaui:
+      disk.device.write.requests.rate_server_cmaui_3:
         type: org.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_cmaui_test_nested4Level:
+      disk.write.bytes.rate_server_cmaui_4_test_nested4Level:
         type: org.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_cmaui_test_nested4Level:
+      disk.latency_server_cmaui_4_test_nested4Level:
         type: org.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_cmaui_test_nested4Level:
+      disk.read.requests_server_cmaui_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      host_server_cmaui:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
+      disk.device.iops_server_cmaui_3:
+        type: org.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_cmaui:
+      disk.device.capacity_server_cmaui_3:
         type: org.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_cmaui_test_nested4Level:
+      disk.device.read.bytes.rate_server_cmaui_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      vcpus_server_cmaui_test_nested4Level:
+      network.incoming.bytes.rate_cmaui_port_7_test_nested4Level:
         type: org.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.usage_server_cmaui_test_nested4Level:
+      feature_server_cmaui_4_test_nested4Level:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.capacity_server_cmaui_4_test_nested4Level:
         type: org.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_cmaui:
+      disk.read.bytes_server_cmaui_3:
         type: org.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_cmaui_port_7_test_nested4Level:
+      network.incoming.bytes.rate_cmaui_port_8_test_nested4Level:
         type: org.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_cmaui:
+      disk.device.write.bytes.rate_server_cmaui_4_test_nested4Level:
         type: org.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_cmaui_test_nested4Level:
+      disk.device.read.requests_server_cmaui_4_test_nested4Level:
         type: org.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_cmaui:
+      disk.device.write.requests_server_cmaui_4_test_nested4Level:
         type: org.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_cmaui_test_nested4Level:
+      disk.write.requests.rate_server_cmaui_3:
         type: org.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_cmaui_port_8_test_nested4Level:
+      disk.device.write.requests.rate_server_cmaui_4_test_nested4Level:
         type: org.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_cmaui:
+      disk.device.read.bytes_server_cmaui_4_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      host_server_cmaui_test_nested4Level:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
+      disk.device.read.bytes_server_cmaui_3:
+        type: org.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_cmaui:
-        type: tosca.capabilities.OperatingSystem
+      memory_server_cmaui_3:
+        type: org.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_cmaui:
+      memory.resident_server_cmaui_4_test_nested4Level:
         type: org.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_cmaui_test_nested4Level:
+      cpu_server_cmaui_3:
         type: org.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_server_cmaui_4_test_nested4Level:
+        type: tosca.capabilities.network.Bindable
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.incoming.packets_cmaui_port_5:
         type: org.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_cmaui_4_test_nested4Level:
+        type: tosca.capabilities.OperatingSystem
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.incoming.packets.rate_cmaui_port_7_test_nested4Level:
         type: org.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_cmaui_test_nested4Level:
+      disk.ephemeral.size_server_cmaui_3:
         type: org.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_cmaui_port_6:
+      cpu.delta_server_cmaui_4_test_nested4Level:
         type: org.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_cmaui_test_nested4Level:
+      network.incoming.packets_cmaui_port_6:
         type: org.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_port_7_test_nested4Level:
+      disk.capacity_server_cmaui_3:
         type: org.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_server_cmaui_test_nested4Level:
+      disk.device.capacity_server_cmaui_4_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests.rate_server_cmaui_test_nested4Level:
+      network.outgoing.bytes.rate_cmaui_port_7_test_nested4Level:
         type: org.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_cmaui_test_nested4Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      scalable_server_cmaui_4_test_nested4Level:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.requests_server_cmaui_test_nested4Level:
+      disk.device.iops_server_cmaui_4_test_nested4Level:
         type: org.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_cmaui_test_nested4Level:
+      disk.read.bytes.rate_server_cmaui_4_test_nested4Level:
         type: org.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_server_cmaui_test_nested4Level:
-        type: tosca.capabilities.network.Bindable
+      endpoint_server_cmaui_4_test_nested4Level:
+        type: tosca.capabilities.Endpoint.Admin
         occurrences:
         - 1
         - UNBOUNDED
@@ -3428,17 +3448,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.usage_server_cmaui_test_nested4Level:
+      vcpus_server_cmaui_4_test_nested4Level:
         type: org.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_cmaui:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
       binding_cmaui_port_5:
         type: tosca.capabilities.network.Bindable
         valid_source_types:
@@ -3459,30 +3474,31 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_8_test_nested4Level:
+      disk.device.write.requests_server_cmaui_3:
         type: org.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_cmaui:
+      network.outgoing.packets.rate_cmaui_port_8_test_nested4Level:
         type: org.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_cmaui:
+      disk.write.bytes_server_cmaui_4_test_nested4Level:
         type: org.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_cmaui_test_nested4Level:
-        type: tosca.capabilities.Node
+      disk.write.requests.rate_server_cmaui_4_test_nested4Level:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes.rate_server_cmaui_test_nested4Level:
+      disk.iops_server_cmaui_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -3512,32 +3528,34 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.iops_server_cmaui:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      host_server_cmaui_4_test_nested4Level:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.iops_server_cmaui:
+      cpu_util_server_cmaui_3:
         type: org.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_server_cmaui_test_nested4Level:
+      disk.device.write.bytes.rate_server_cmaui_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes_server_cmaui:
+      disk.write.bytes.rate_server_cmaui_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      scalable_server_cmaui_test_nested4Level:
-        type: tosca.capabilities.Scalable
+      disk.device.write.bytes_server_cmaui_3:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
@@ -3553,20 +3571,19 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes.rate_server_cmaui_test_nested4Level:
+      disk.iops_server_cmaui_4_test_nested4Level:
         type: org.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_5:
+      feature_server_cmaui_3:
         type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.allocation_server_cmaui_test_nested4Level:
-        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_port_5:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
@@ -3575,19 +3592,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests_server_cmaui_test_nested4Level:
-        type: org.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_cmaui:
-        type: org.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_server_cmaui_test_nested4Level:
+      cpu_server_cmaui_4_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -3598,12 +3603,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests.rate_server_cmaui_test_nested4Level:
-        type: org.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_8_test_nested4Level:
         type: tosca.capabilities.network.Bindable
         valid_source_types:
@@ -3611,19 +3610,19 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-      network.incoming.packets.rate_cmaui_port_5:
+      disk.write.bytes_server_cmaui_3:
         type: org.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_server_cmaui:
+      network.incoming.packets.rate_cmaui_port_5:
         type: org.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_server_cmaui:
+      disk.allocation_server_cmaui_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -3634,77 +3633,63 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_7_test_nested4Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      binding_server_cmaui_3:
+        type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_5:
+      vcpus_server_cmaui_3:
         type: org.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_6:
+      network.outgoing.packets.rate_cmaui_port_7_test_nested4Level:
         type: org.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_5:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
-      feature_cmaui_port_8_test_nested4Level:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.device.latency_server_cmaui:
+      instance_server_cmaui_4_test_nested4Level:
         type: org.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_cmaui:
+      network.outgoing.packets.rate_cmaui_port_5:
         type: org.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_cmaui:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      scalable_server_cmaui_3:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
-      disk.usage_server_cmaui:
+      network.outgoing.packets.rate_cmaui_port_6:
         type: org.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.usage_server_cmaui:
-        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_port_5:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_cmaui_port_7_test_nested4Level:
-        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_port_8_test_nested4Level:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.capacity_server_cmaui:
+      disk.write.requests_server_cmaui_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests.rate_server_cmaui:
+      network.outpoing.packets_cmaui_port_7_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -3715,19 +3700,19 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_cmaui_port_8_test_nested4Level:
+      disk.usage_server_cmaui_3:
         type: org.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_cmaui_test_nested4Level:
+      disk.device.write.bytes_server_cmaui_4_test_nested4Level:
         type: org.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_server_cmaui:
+      network.outgoing.bytes.rate_cmaui_port_8_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -3738,30 +3723,29 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      endpoint_server_cmaui_test_nested4Level:
+      endpoint_server_cmaui_3:
         type: tosca.capabilities.Endpoint.Admin
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_cmaui_port_6:
+      memory_server_cmaui_4_test_nested4Level:
         type: org.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_server_cmaui:
+      network.incoming.packets.rate_cmaui_port_6:
         type: org.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_cmaui_test_nested4Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      os_server_cmaui_3:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      memory.resident_server_cmaui_test_nested4Level:
+      disk.root.size_server_cmaui_4_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -3774,88 +3758,97 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-      binding_server_cmaui:
-        type: tosca.capabilities.network.Bindable
+      disk.usage_server_cmaui_4_test_nested4Level:
+        type: org.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_cmaui:
+      disk.device.latency_server_cmaui_4_test_nested4Level:
         type: org.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_cmaui:
+      disk.device.read.requests.rate_server_cmaui_4_test_nested4Level:
         type: org.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_7_test_nested4Level:
+      disk.ephemeral.size_server_cmaui_4_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes_server_cmaui_test_nested4Level:
+      disk.device.allocation_server_cmaui_3:
         type: org.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_server_cmaui_test_nested4Level:
+      disk.read.bytes_server_cmaui_4_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests_server_cmaui_test_nested4Level:
+      disk.allocation_server_cmaui_4_test_nested4Level:
         type: org.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_cmaui_test_nested4Level:
+      network.outgoing.bytes_cmaui_port_7_test_nested4Level:
         type: org.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_cmaui_port_7_test_nested4Level:
+      disk.device.allocation_server_cmaui_4_test_nested4Level:
         type: org.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_test_nested4Level:
-        type: tosca.capabilities.Node
+      host_server_cmaui_3:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
-      os_server_cmaui_test_nested4Level:
-        type: tosca.capabilities.OperatingSystem
+      disk.write.requests_server_cmaui_4_test_nested4Level:
+        type: org.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_cmaui_port_6:
+      network.incoming.packets_cmaui_port_7_test_nested4Level:
         type: org.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_cmaui:
+      feature_test_nested4Level:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.incoming.bytes.rate_cmaui_port_6:
         type: org.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_8_test_nested4Level:
+      instance_server_cmaui_3:
         type: org.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_cmaui_test_nested4Level:
+      network.incoming.packets.rate_cmaui_port_8_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -3867,19 +3860,19 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.latency_server_cmaui:
+      network.outgoing.bytes_cmaui_port_6:
         type: org.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_6:
+      network.outpoing.packets_cmaui_port_6:
         type: org.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_6:
+      disk.read.bytes.rate_server_cmaui_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -3891,56 +3884,63 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      vcpus_server_cmaui:
+      disk.device.usage_server_cmaui_4_test_nested4Level:
+        type: org.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_server_cmaui_4_test_nested4Level:
         type: org.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_server_cmaui:
+      network.incoming.bytes.rate_cmaui_port_5:
         type: org.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_cmaui_test_nested4Level:
+      disk.device.read.requests_server_cmaui_3:
         type: org.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_cmaui_test_nested4Level:
+      network.incoming.bytes_cmaui_port_7_test_nested4Level:
         type: org.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_cmaui_port_5:
+      disk.device.read.requests.rate_server_cmaui_3:
         type: org.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_cmaui:
+      cpu.delta_server_cmaui_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests_server_cmaui:
+      memory.resident_server_cmaui_3:
         type: org.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_7_test_nested4Level:
+      disk.latency_server_cmaui_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      endpoint_server_cmaui:
-        type: tosca.capabilities.Endpoint.Admin
+      memory.usage_server_cmaui_3:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
@@ -4007,47 +4007,58 @@ node_types:
         occurrences:
         - 1
         - 1
-    - dependency_cmaui_port_8:
+    - dependency_server_cmaui_4:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_cmaui_port_8:
-        capability: tosca.capabilities.network.Linkable
-        relationship: tosca.relationships.network.LinksTo
+    - local_storage_server_cmaui_4:
+        capability: tosca.capabilities.Attachment
+        node: tosca.nodes.BlockStorage
+        relationship: tosca.relationships.AttachesTo
         occurrences:
-        - 1
-        - 1
-    - dependency_server_cmaui:
+        - 0
+        - UNBOUNDED
+    - dependency_cmaui_port_8:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - local_storage_server_cmaui:
-        capability: tosca.capabilities.Attachment
-        node: tosca.nodes.BlockStorage
-        relationship: tosca.relationships.AttachesTo
+    - link_cmaui_port_8:
+        capability: tosca.capabilities.network.Linkable
+        relationship: tosca.relationships.network.LinksTo
         occurrences:
-        - 0
-        - UNBOUNDED
+        - 1
+        - 1
     capabilities:
-      cpu.delta_server_cmaui:
+      disk.write.bytes_server_cmaui_4:
+        type: org.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_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests.rate_server_cmaui:
+      feature_server_cmaui_4:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.latency_server_cmaui_4:
         type: org.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_cmaui:
+      disk.device.usage_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -4063,61 +4074,59 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      scalable_server_cmaui:
-        type: tosca.capabilities.Scalable
+      disk.read.requests_server_cmaui_4:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes.rate_server_cmaui:
+      disk.allocation_server_cmaui_4:
         type: org.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_cmaui:
+      network.outgoing.packets.rate_cmaui_port_8:
         type: org.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_server_cmaui:
-        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_port_7:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes.rate_server_cmaui:
+      vcpus_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      host_server_cmaui:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
+      binding_server_cmaui_4:
+        type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_util_server_cmaui:
+      disk.root.size_server_cmaui_4:
         type: org.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_8:
+      disk.device.write.requests.rate_server_cmaui_4:
         type: org.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_7:
+      attachment_cmaui_port_8:
         type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_cmaui_port_8:
-        type: tosca.capabilities.Attachment
+      scalable_server_cmaui_4:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
@@ -4127,121 +4136,110 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.latency_server_cmaui:
+      disk.write.requests_server_cmaui_4:
         type: org.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_cmaui:
+      disk.usage_server_cmaui_4:
         type: org.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_cmaui:
+      disk.device.capacity_server_cmaui_4:
         type: org.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_cmaui:
+      disk.device.iops_server_cmaui_4:
         type: org.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_cmaui:
+      disk.device.read.bytes.rate_server_cmaui_4:
         type: org.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.usage_server_cmaui:
-        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_cmaui_4:
+        type: tosca.capabilities.Endpoint.Admin
         occurrences:
         - 1
         - UNBOUNDED
-      disk.capacity_server_cmaui:
+      disk.read.bytes_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests.rate_server_cmaui:
+      network.incoming.packets.rate_cmaui_port_7:
         type: org.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_server_cmaui:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      os_server_cmaui_4:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      instance_server_cmaui:
+      network.incoming.packets.rate_cmaui_port_8:
         type: org.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_cmaui:
+      disk.device.allocation_server_cmaui_4:
         type: org.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_7:
+      disk.write.requests.rate_server_cmaui_4:
         type: org.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_server_cmaui:
+      disk.device.read.bytes_server_cmaui_4:
         type: org.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_8:
+      memory_server_cmaui_4:
         type: org.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_cmaui:
+      disk.write.bytes.rate_server_cmaui_4:
         type: org.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_server_cmaui:
-        type: tosca.capabilities.network.Bindable
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.device.read.requests.rate_server_cmaui:
+      cpu_server_cmaui_4:
         type: org.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_cmaui:
+      disk.capacity_server_cmaui_4:
         type: org.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_cmaui:
-        type: tosca.capabilities.OperatingSystem
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.device.write.bytes.rate_server_cmaui:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      host_server_cmaui_4:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
@@ -4263,13 +4261,13 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_cmaui_port_8:
+      instance_server_cmaui_4:
         type: org.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_cmaui:
+      network.incoming.bytes.rate_cmaui_port_8:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -4281,24 +4279,13 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.latency_server_cmaui:
-        type: org.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_cmaui:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
       network.outpoing.packets_cmaui_port_7:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      vcpus_server_cmaui:
+      disk.read.bytes.rate_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -4310,7 +4297,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes_server_cmaui:
+      disk.device.write.requests_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -4329,6 +4316,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      disk.device.read.requests_server_cmaui_4:
+        type: org.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_8:
         type: tosca.capabilities.network.Bindable
         valid_source_types:
@@ -4336,44 +4329,45 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-      disk.allocation_server_cmaui:
+      disk.iops_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests_server_cmaui:
+      disk.device.read.requests.rate_server_cmaui_4:
         type: org.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_cmaui:
+      cpu.delta_server_cmaui_4:
         type: org.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_cmaui:
+      memory.resident_server_cmaui_4:
         type: org.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_port_7:
+      disk.ephemeral.size_server_cmaui_4:
         type: org.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_8:
+      network.outgoing.bytes.rate_cmaui_port_7:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      endpoint_server_cmaui:
-        type: tosca.capabilities.Endpoint.Admin
+      network.incoming.bytes_cmaui_port_8:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
@@ -4383,7 +4377,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.iops_server_cmaui:
+      disk.latency_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -4395,13 +4389,19 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.iops_server_cmaui:
+      disk.device.write.bytes.rate_server_cmaui_4:
+        type: org.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_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes_server_cmaui:
+      cpu_util_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/sharedNestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/sharedNestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml
index 42b1a26b87..41205547a5 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/sharedNestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/sharedNestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml
@@ -85,9 +85,9 @@ topology_template:
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
-          node: server_cmaui
+          node: server_cmaui_1
           relationship: tosca.relationships.network.BindsTo
-    server_cmaui:
+    server_cmaui_1:
       type: org.openecomp.resource.vfc.nodes.heat.cmaui
       properties:
         flavor:
@@ -137,7 +137,7 @@ topology_template:
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
-          node: server_cmaui
+          node: server_cmaui_1
           relationship: tosca.relationships.network.BindsTo
   groups:
     nested1_group:
@@ -147,105 +147,111 @@ topology_template:
         description: nested1
       members:
       - cmaui_port_2
-      - server_cmaui
+      - server_cmaui_1
       - test_nested2Level
       - cmaui_port_1
   substitution_mappings:
     node_type: org.openecomp.resource.abstract.nodes.heat.nested1
     capabilities:
-      os_server_cmaui_test_nested2Level:
+      memory.resident_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - os_server_cmaui
-      disk.device.write.requests.rate_server_cmaui:
-      - server_cmaui
-      - disk.device.write.requests.rate
-      disk.device.allocation_server_cmaui:
-      - server_cmaui
-      - disk.device.allocation
-      disk.device.allocation_server_cmaui_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - disk.device.allocation_server_cmaui_test_nested3Level
+      - memory.resident_server_cmaui_3_test_nested3Level
       network.outpoing.packets_cmaui_port_6_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.outpoing.packets_cmaui_port_6_test_nested3Level
       binding_cmaui_port_6_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - binding_cmaui_port_6_test_nested3Level
-      disk.ephemeral.size_server_cmaui_test_nested3Level_test_nested2Level:
+      memory.resident_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.ephemeral.size_server_cmaui_test_nested3Level
-      disk.device.usage_server_cmaui_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - disk.device.usage_server_cmaui_test_nested3Level
-      host_server_cmaui:
-      - server_cmaui
-      - host
-      disk.device.latency_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - memory.resident_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.device.latency_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.latency
+      disk.device.latency_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.latency_server_cmaui_test_nested4Level_test_nested3Level
-      disk.write.requests_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - disk.device.latency_server_cmaui_3_test_nested3Level
+      disk.device.read.requests_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.write.requests_server_cmaui_test_nested4Level_test_nested3Level
-      feature_server_cmaui_test_nested2Level:
+      - disk.device.read.requests_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.root.size_server_cmaui_1:
+      - server_cmaui_1
+      - disk.root.size
+      scalable_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - feature_server_cmaui
+      - scalable_server_cmaui_3_test_nested3Level
       network.outgoing.bytes_cmaui_port_2:
       - cmaui_port_2
       - network.outgoing.bytes
-      endpoint_server_cmaui_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - endpoint_server_cmaui_test_nested3Level
+      disk.read.requests_server_cmaui_1:
+      - server_cmaui_1
+      - disk.read.requests
       network.outgoing.bytes_cmaui_port_1:
       - cmaui_port_1
       - network.outgoing.bytes
       binding_cmaui_port_5_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - binding_cmaui_port_5_test_nested3Level
-      disk.device.write.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      endpoint_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.device.write.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level
-      instance_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - endpoint_server_cmaui_2
+      binding_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - instance_server_cmaui_test_nested4Level_test_nested3Level
+      - binding_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.latency_server_cmaui_3_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - disk.latency_server_cmaui_3_test_nested3Level
       network.incoming.packets_cmaui_port_3_test_nested2Level:
       - test_nested2Level
       - network.incoming.packets_cmaui_port_3
-      feature_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - feature_server_cmaui_test_nested4Level_test_nested3Level
-      disk.root.size_server_cmaui_test_nested2Level:
-      - test_nested2Level
-      - disk.root.size_server_cmaui
-      disk.write.requests_server_cmaui_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - disk.write.requests_server_cmaui_test_nested3Level
       binding_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - binding_cmaui_port_8_test_nested4Level_test_nested3Level
-      disk.root.size_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.device.read.bytes.rate_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.read.bytes.rate
+      feature_server_cmaui_2_test_nested2Level:
+      - test_nested2Level
+      - feature_server_cmaui_2
+      disk.read.bytes_server_cmaui_1:
+      - server_cmaui_1
+      - disk.read.bytes
+      disk.capacity_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.root.size_server_cmaui_test_nested4Level_test_nested3Level
-      disk.usage_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - disk.capacity_server_cmaui_2
+      disk.write.bytes_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.usage_server_cmaui_test_nested4Level_test_nested3Level
-      instance_server_cmaui:
-      - server_cmaui
-      - instance
-      cpu.delta_server_cmaui_test_nested3Level_test_nested2Level:
+      - disk.write.bytes_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.device.read.bytes_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.read.bytes
+      disk.device.write.requests_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - cpu.delta_server_cmaui_test_nested3Level
+      - disk.device.write.requests_server_cmaui_2
+      disk.write.requests.rate_server_cmaui_1:
+      - server_cmaui_1
+      - disk.write.requests.rate
       network.incoming.packets.rate_cmaui_port_6_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.incoming.packets.rate_cmaui_port_6_test_nested3Level
+      disk.device.read.bytes_server_cmaui_2_test_nested2Level:
+      - test_nested2Level
+      - disk.device.read.bytes_server_cmaui_2
       network.incoming.packets_cmaui_port_4_test_nested2Level:
       - test_nested2Level
       - network.incoming.packets_cmaui_port_4
       network.incoming.bytes_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.incoming.bytes_cmaui_port_7_test_nested4Level_test_nested3Level
-      cpu_server_cmaui_test_nested2Level:
+      cpu_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - cpu_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.device.write.requests.rate_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - cpu_server_cmaui
+      - disk.device.write.requests.rate_server_cmaui_2
+      disk.latency_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - disk.latency_server_cmaui_4_test_nested4Level_test_nested3Level
       network.incoming.bytes_cmaui_port_3_test_nested2Level:
       - test_nested2Level
       - network.incoming.bytes_cmaui_port_3
@@ -255,129 +261,105 @@ topology_template:
       network.incoming.packets.rate_cmaui_port_5_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.incoming.packets.rate_cmaui_port_5_test_nested3Level
-      os_server_cmaui:
-      - server_cmaui
-      - os
-      memory.resident_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.read.bytes_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - memory.resident_server_cmaui_test_nested3Level
+      - disk.read.bytes_server_cmaui_2
       binding_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - binding_cmaui_port_7_test_nested4Level_test_nested3Level
-      os_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - os_server_cmaui_test_nested4Level_test_nested3Level
-      disk.device.read.requests.rate_server_cmaui_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - disk.device.read.requests.rate_server_cmaui_test_nested3Level
       network.incoming.bytes.rate_cmaui_port_4_test_nested2Level:
       - test_nested2Level
       - network.incoming.bytes.rate_cmaui_port_4
-      disk.write.bytes_server_cmaui_test_nested2Level:
-      - test_nested2Level
-      - disk.write.bytes_server_cmaui
-      scalable_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - scalable_server_cmaui_test_nested4Level_test_nested3Level
-      instance_server_cmaui_test_nested2Level:
-      - test_nested2Level
-      - instance_server_cmaui
       network.incoming.bytes_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.incoming.bytes_cmaui_port_8_test_nested4Level_test_nested3Level
-      endpoint_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.device.allocation_server_cmaui_2_test_nested2Level:
+      - test_nested2Level
+      - disk.device.allocation_server_cmaui_2
+      disk.ephemeral.size_server_cmaui_1:
+      - server_cmaui_1
+      - disk.ephemeral.size
+      disk.device.read.bytes_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - endpoint_server_cmaui_test_nested4Level_test_nested3Level
-      disk.ephemeral.size_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - disk.device.read.bytes_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.device.capacity_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.ephemeral.size_server_cmaui_test_nested4Level_test_nested3Level
+      - disk.device.capacity_server_cmaui_4_test_nested4Level_test_nested3Level
       network.outgoing.bytes.rate_cmaui_port_5_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.outgoing.bytes.rate_cmaui_port_5_test_nested3Level
       network.incoming.bytes.rate_cmaui_port_6_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.incoming.bytes.rate_cmaui_port_6_test_nested3Level
-      disk.device.allocation_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - disk.device.allocation_server_cmaui_test_nested4Level_test_nested3Level
-      disk.read.bytes.rate_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.device.read.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.read.bytes.rate_server_cmaui_test_nested3Level
-      disk.capacity_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - disk.device.read.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.read.bytes_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.capacity_server_cmaui_test_nested4Level_test_nested3Level
-      disk.latency_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - disk.read.bytes_server_cmaui_4_test_nested4Level_test_nested3Level
+      instance_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.latency_server_cmaui_test_nested4Level_test_nested3Level
-      feature_server_cmaui:
-      - server_cmaui
-      - feature
+      - instance_server_cmaui_3_test_nested3Level
       binding_cmaui_port_1:
       - cmaui_port_1
       - binding
       binding_cmaui_port_2:
       - cmaui_port_2
       - binding
-      binding_server_cmaui_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - binding_server_cmaui_test_nested3Level
       feature_test_nested2Level:
       - test_nested2Level
       - feature
-      memory.usage_server_cmaui:
-      - server_cmaui
-      - memory.usage
-      disk.ephemeral.size_server_cmaui:
-      - server_cmaui
-      - disk.ephemeral.size
-      os_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.write.requests_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - os_server_cmaui_test_nested3Level
-      network.incoming.packets_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - network.incoming.packets_cmaui_port_8_test_nested4Level_test_nested3Level
-      cpu_util_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - disk.write.requests_server_cmaui_3_test_nested3Level
+      disk.device.write.requests_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.write.requests
+      cpu_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - cpu_util_server_cmaui_test_nested4Level_test_nested3Level
-      disk.write.bytes_server_cmaui_test_nested3Level_test_nested2Level:
+      - cpu_server_cmaui_3_test_nested3Level
+      disk.read.requests_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.write.bytes_server_cmaui_test_nested3Level
-      disk.device.read.requests_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - disk.read.requests_server_cmaui_4_test_nested4Level_test_nested3Level
+      network.incoming.packets_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.read.requests_server_cmaui_test_nested4Level_test_nested3Level
-      disk.device.iops_server_cmaui:
-      - server_cmaui
-      - disk.device.iops
+      - network.incoming.packets_cmaui_port_8_test_nested4Level_test_nested3Level
+      disk.device.write.bytes.rate_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.write.bytes.rate
+      cpu_util_server_cmaui_1:
+      - server_cmaui_1
+      - cpu_util
       network.incoming.bytes.rate_cmaui_port_5_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.incoming.bytes.rate_cmaui_port_5_test_nested3Level
       network.incoming.bytes_cmaui_port_2:
       - cmaui_port_2
       - network.incoming.bytes
-      disk.device.iops_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - disk.device.iops_server_cmaui_test_nested4Level_test_nested3Level
       network.incoming.bytes_cmaui_port_1:
       - cmaui_port_1
       - network.incoming.bytes
       network.incoming.bytes_cmaui_port_5_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.incoming.bytes_cmaui_port_5_test_nested3Level
+      disk.write.bytes.rate_server_cmaui_1:
+      - server_cmaui_1
+      - disk.write.bytes.rate
+      disk.device.write.bytes_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.write.bytes
+      disk.device.read.requests.rate_server_cmaui_3_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - disk.device.read.requests.rate_server_cmaui_3_test_nested3Level
       network.outgoing.bytes.rate_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.outgoing.bytes.rate_cmaui_port_8_test_nested4Level_test_nested3Level
-      disk.device.read.requests_server_cmaui_test_nested2Level:
-      - test_nested2Level
-      - disk.device.read.requests_server_cmaui
       network.incoming.packets.rate_cmaui_port_1:
       - cmaui_port_1
       - network.incoming.packets.rate
       network.incoming.packets.rate_cmaui_port_2:
       - cmaui_port_2
       - network.incoming.packets.rate
-      cpu_server_cmaui:
-      - server_cmaui
-      - cpu
       network.incoming.bytes.rate_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.incoming.bytes.rate_cmaui_port_8_test_nested4Level_test_nested3Level
@@ -387,402 +369,369 @@ topology_template:
       feature_cmaui_port_2:
       - cmaui_port_2
       - feature
-      disk.device.read.bytes.rate_server_cmaui:
-      - server_cmaui
-      - disk.device.read.bytes.rate
-      disk.device.read.requests.rate_server_cmaui_test_nested2Level:
+      cpu_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.device.read.requests.rate_server_cmaui
-      disk.device.latency_server_cmaui_test_nested2Level:
+      - cpu_server_cmaui_2
+      disk.ephemeral.size_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.latency_server_cmaui
-      disk.device.latency_server_cmaui:
-      - server_cmaui
-      - disk.device.latency
-      disk.read.requests_server_cmaui:
-      - server_cmaui
-      - disk.read.requests
-      disk.usage_server_cmaui:
-      - server_cmaui
-      - disk.usage
-      disk.device.usage_server_cmaui:
-      - server_cmaui
-      - disk.device.usage
-      disk.capacity_server_cmaui:
-      - server_cmaui
-      - disk.capacity
-      disk.write.requests.rate_server_cmaui:
-      - server_cmaui
-      - disk.write.requests.rate
+      - disk.ephemeral.size_server_cmaui_3_test_nested3Level
+      binding_server_cmaui_1:
+      - server_cmaui_1
+      - binding
+      disk.root.size_server_cmaui_3_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - disk.root.size_server_cmaui_3_test_nested3Level
+      os_server_cmaui_3_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - os_server_cmaui_3_test_nested3Level
+      disk.device.read.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - disk.device.read.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level
+      cpu_util_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - cpu_util_server_cmaui_4_test_nested4Level_test_nested3Level
+      scalable_server_cmaui_1:
+      - server_cmaui_1
+      - scalable
+      disk.write.bytes_server_cmaui_3_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - disk.write.bytes_server_cmaui_3_test_nested3Level
+      memory_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - memory_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.device.write.bytes_server_cmaui_2_test_nested2Level:
+      - test_nested2Level
+      - disk.device.write.bytes_server_cmaui_2
       network.incoming.packets.rate_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.incoming.packets.rate_cmaui_port_7_test_nested4Level_test_nested3Level
-      disk.write.bytes.rate_server_cmaui_test_nested2Level:
-      - test_nested2Level
-      - disk.write.bytes.rate_server_cmaui
       network.outpoing.packets_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.outpoing.packets_cmaui_port_8_test_nested4Level_test_nested3Level
-      disk.device.read.requests_server_cmaui:
-      - server_cmaui
-      - disk.device.read.requests
-      disk.iops_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - disk.iops_server_cmaui_test_nested4Level_test_nested3Level
-      disk.device.iops_server_cmaui_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - disk.device.iops_server_cmaui_test_nested3Level
+      endpoint_server_cmaui_1:
+      - server_cmaui_1
+      - endpoint
       network.incoming.bytes.rate_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.incoming.bytes.rate_cmaui_port_7_test_nested4Level_test_nested3Level
-      disk.write.requests.rate_server_cmaui_test_nested2Level:
+      os_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.write.requests.rate_server_cmaui
-      binding_server_cmaui:
-      - server_cmaui
-      - binding
+      - os_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.usage_server_cmaui_2_test_nested2Level:
+      - test_nested2Level
+      - disk.usage_server_cmaui_2
       network.outgoing.packets.rate_cmaui_port_4_test_nested2Level:
       - test_nested2Level
       - network.outgoing.packets.rate_cmaui_port_4
-      disk.device.read.requests.rate_server_cmaui:
-      - server_cmaui
-      - disk.device.read.requests.rate
-      vcpus_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.device.read.requests.rate_server_cmaui_2_test_nested2Level:
+      - test_nested2Level
+      - disk.device.read.requests.rate_server_cmaui_2
+      disk.read.bytes.rate_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - vcpus_server_cmaui_test_nested3Level
+      - disk.read.bytes.rate_server_cmaui_3_test_nested3Level
+      disk.device.iops_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - disk.device.iops_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.device.allocation_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.allocation
       network.incoming.packets.rate_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.incoming.packets.rate_cmaui_port_8_test_nested4Level_test_nested3Level
       network.outpoing.packets_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.outpoing.packets_cmaui_port_7_test_nested4Level_test_nested3Level
-      disk.device.capacity_server_cmaui_test_nested3Level_test_nested2Level:
+      memory_server_cmaui_1:
+      - server_cmaui_1
+      - memory
+      disk.device.write.bytes_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.capacity_server_cmaui_test_nested3Level
-      disk.write.bytes_server_cmaui:
-      - server_cmaui
-      - disk.write.bytes
-      endpoint_server_cmaui_test_nested2Level:
+      - disk.device.write.bytes_server_cmaui_3_test_nested3Level
+      disk.write.requests.rate_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - endpoint_server_cmaui
+      - disk.write.requests.rate_server_cmaui_3_test_nested3Level
       network.incoming.packets_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.incoming.packets_cmaui_port_7_test_nested4Level_test_nested3Level
-      disk.write.bytes.rate_server_cmaui_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - disk.write.bytes.rate_server_cmaui_test_nested3Level
-      disk.read.bytes_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      os_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.read.bytes_server_cmaui_test_nested4Level_test_nested3Level
+      - os_server_cmaui_2
       network.outgoing.bytes_cmaui_port_5_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.outgoing.bytes_cmaui_port_5_test_nested3Level
-      cpu_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.read.requests_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - cpu_server_cmaui_test_nested3Level
-      disk.device.read.bytes.rate_server_cmaui_test_nested2Level:
+      - disk.read.requests_server_cmaui_3_test_nested3Level
+      vcpus_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.read.bytes.rate_server_cmaui
+      - vcpus_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.device.capacity_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.capacity
+      disk.device.iops_server_cmaui_2_test_nested2Level:
+      - test_nested2Level
+      - disk.device.iops_server_cmaui_2
       network.incoming.bytes_cmaui_port_4_test_nested2Level:
       - test_nested2Level
       - network.incoming.bytes_cmaui_port_4
       feature_cmaui_port_3_test_nested2Level:
       - test_nested2Level
       - feature_cmaui_port_3
+      disk.read.bytes.rate_server_cmaui_2_test_nested2Level:
+      - test_nested2Level
+      - disk.read.bytes.rate_server_cmaui_2
       network.outpoing.packets_cmaui_port_5_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.outpoing.packets_cmaui_port_5_test_nested3Level
-      disk.root.size_server_cmaui_test_nested3Level_test_nested2Level:
+      instance_server_cmaui_1:
+      - server_cmaui_1
+      - instance
+      instance_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.root.size_server_cmaui_test_nested3Level
-      memory.usage_server_cmaui_test_nested3Level_test_nested2Level:
+      - instance_server_cmaui_4_test_nested4Level_test_nested3Level
+      memory_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - memory.usage_server_cmaui_test_nested3Level
+      - memory_server_cmaui_3_test_nested3Level
       attachment_cmaui_port_3_test_nested2Level:
       - test_nested2Level
       - attachment_cmaui_port_3
-      binding_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - binding_server_cmaui_test_nested4Level_test_nested3Level
-      vcpus_server_cmaui:
-      - server_cmaui
-      - vcpus
-      disk.device.write.bytes_server_cmaui:
-      - server_cmaui
-      - disk.device.write.bytes
-      disk.read.bytes_server_cmaui_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - disk.read.bytes_server_cmaui_test_nested3Level
-      instance_server_cmaui_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - instance_server_cmaui_test_nested3Level
-      memory_server_cmaui_test_nested2Level:
-      - test_nested2Level
-      - memory_server_cmaui
-      disk.allocation_server_cmaui:
-      - server_cmaui
-      - disk.allocation
-      disk.device.write.requests_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      endpoint_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.write.requests_server_cmaui_test_nested4Level_test_nested3Level
+      - endpoint_server_cmaui_4_test_nested4Level_test_nested3Level
       network.outpoing.packets_cmaui_port_1:
       - cmaui_port_1
       - network.outpoing.packets
       network.outpoing.packets_cmaui_port_2:
       - cmaui_port_2
       - network.outpoing.packets
+      disk.device.read.requests_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.read.requests
+      cpu.delta_server_cmaui_1:
+      - server_cmaui_1
+      - cpu.delta
       attachment_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - attachment_cmaui_port_7_test_nested4Level_test_nested3Level
-      disk.ephemeral.size_server_cmaui_test_nested2Level:
-      - test_nested2Level
-      - disk.ephemeral.size_server_cmaui
-      disk.device.read.bytes_server_cmaui_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - disk.device.read.bytes_server_cmaui_test_nested3Level
-      disk.device.allocation_server_cmaui_test_nested2Level:
-      - test_nested2Level
-      - disk.device.allocation_server_cmaui
-      disk.device.iops_server_cmaui_test_nested2Level:
-      - test_nested2Level
-      - disk.device.iops_server_cmaui
-      binding_server_cmaui_test_nested2Level:
+      disk.device.read.bytes_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - binding_server_cmaui
+      - disk.device.read.bytes_server_cmaui_3_test_nested3Level
       network.outgoing.bytes_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.outgoing.bytes_cmaui_port_7_test_nested4Level_test_nested3Level
-      disk.device.write.bytes_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.write.bytes.rate_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.write.bytes_server_cmaui_test_nested4Level_test_nested3Level
-      memory.usage_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - disk.write.bytes.rate_server_cmaui_3_test_nested3Level
+      disk.device.allocation_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - memory.usage_server_cmaui_test_nested4Level_test_nested3Level
-      cpu.delta_server_cmaui:
-      - server_cmaui
-      - cpu.delta
+      - disk.device.allocation_server_cmaui_3_test_nested3Level
       feature_cmaui_port_5_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - feature_cmaui_port_5_test_nested3Level
-      disk.device.capacity_server_cmaui_test_nested2Level:
+      cpu_util_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.device.capacity_server_cmaui
+      - cpu_util_server_cmaui_2
       attachment_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - attachment_cmaui_port_8_test_nested4Level_test_nested3Level
-      disk.write.requests_server_cmaui_test_nested2Level:
+      memory.usage_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.write.requests_server_cmaui
-      scalable_server_cmaui:
-      - server_cmaui
-      - scalable
-      disk.read.bytes.rate_server_cmaui:
-      - server_cmaui
-      - disk.read.bytes.rate
-      disk.device.usage_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - memory.usage_server_cmaui_2
+      disk.device.usage_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.usage
+      disk.write.requests_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.usage_server_cmaui_test_nested4Level_test_nested3Level
-      scalable_server_cmaui_test_nested3Level_test_nested2Level:
+      - disk.write.requests_server_cmaui_4_test_nested4Level_test_nested3Level
+      feature_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - scalable_server_cmaui_test_nested3Level
-      disk.read.bytes_server_cmaui_test_nested2Level:
+      - feature_server_cmaui_3_test_nested3Level
+      disk.device.read.requests_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.read.bytes_server_cmaui
-      disk.device.latency_server_cmaui_test_nested3Level_test_nested2Level:
+      - disk.device.read.requests_server_cmaui_3_test_nested3Level
+      disk.root.size_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.latency_server_cmaui_test_nested3Level
-      cpu.delta_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - disk.root.size_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.device.write.requests.rate_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - cpu.delta_server_cmaui_test_nested4Level_test_nested3Level
+      - disk.device.write.requests.rate_server_cmaui_3_test_nested3Level
       network.outgoing.bytes_cmaui_port_3_test_nested2Level:
       - test_nested2Level
       - network.outgoing.bytes_cmaui_port_3
-      disk.usage_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.device.write.requests.rate_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.write.requests.rate
+      disk.read.requests_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.usage_server_cmaui_test_nested3Level
-      cpu_util_server_cmaui:
-      - server_cmaui
-      - cpu_util
-      disk.device.write.requests_server_cmaui:
-      - server_cmaui
-      - disk.device.write.requests
-      disk.write.requests.rate_server_cmaui_test_nested3Level_test_nested2Level:
+      - disk.read.requests_server_cmaui_2
+      feature_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - feature_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.device.write.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - disk.device.write.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.write.bytes.rate_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.write.requests.rate_server_cmaui_test_nested3Level
-      disk.capacity_server_cmaui_test_nested2Level:
+      - disk.write.bytes.rate_server_cmaui_2
+      disk.latency_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.capacity_server_cmaui
-      disk.device.write.bytes.rate_server_cmaui_test_nested2Level:
+      - disk.latency_server_cmaui_2
+      vcpus_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.write.bytes.rate_server_cmaui
+      - vcpus_server_cmaui_3_test_nested3Level
+      disk.device.iops_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.iops
       network.outgoing.bytes_cmaui_port_4_test_nested2Level:
       - test_nested2Level
       - network.outgoing.bytes_cmaui_port_4
-      disk.device.usage_server_cmaui_test_nested2Level:
+      disk.device.write.bytes_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.usage_server_cmaui
-      disk.read.requests_server_cmaui_test_nested3Level_test_nested2Level:
+      - disk.device.write.bytes_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.device.usage_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.read.requests_server_cmaui_test_nested3Level
-      disk.device.read.bytes_server_cmaui:
-      - server_cmaui
-      - disk.device.read.bytes
+      - disk.device.usage_server_cmaui_4_test_nested4Level_test_nested3Level
       network.incoming.packets_cmaui_port_5_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.incoming.packets_cmaui_port_5_test_nested3Level
-      cpu_util_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.capacity_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - cpu_util_server_cmaui_test_nested3Level
-      disk.root.size_server_cmaui:
-      - server_cmaui
-      - disk.root.size
-      disk.latency_server_cmaui_test_nested3Level_test_nested2Level:
+      - disk.capacity_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.device.write.bytes.rate_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.latency_server_cmaui_test_nested3Level
-      disk.device.write.requests.rate_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - disk.device.write.bytes.rate_server_cmaui_2
+      disk.device.read.requests_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.device.write.requests.rate_server_cmaui_test_nested4Level_test_nested3Level
-      vcpus_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - disk.device.read.requests_server_cmaui_2
+      cpu_server_cmaui_1:
+      - server_cmaui_1
+      - cpu
+      memory.resident_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - vcpus_server_cmaui_test_nested4Level_test_nested3Level
-      disk.capacity_server_cmaui_test_nested3Level_test_nested2Level:
+      - memory.resident_server_cmaui_2
+      disk.device.iops_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.capacity_server_cmaui_test_nested3Level
-      disk.device.write.requests.rate_server_cmaui_test_nested2Level:
+      - disk.device.iops_server_cmaui_3_test_nested3Level
+      disk.allocation_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.device.write.requests.rate_server_cmaui
+      - disk.allocation_server_cmaui_2
       network.incoming.packets_cmaui_port_2:
       - cmaui_port_2
       - network.incoming.packets
-      disk.device.write.bytes.rate_server_cmaui:
-      - server_cmaui
-      - disk.device.write.bytes.rate
-      disk.device.read.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - disk.device.read.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level
       network.outgoing.packets.rate_cmaui_port_6_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.outgoing.packets.rate_cmaui_port_6_test_nested3Level
       network.incoming.packets_cmaui_port_1:
       - cmaui_port_1
       - network.incoming.packets
-      disk.device.read.bytes_server_cmaui_test_nested2Level:
+      memory.usage_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - memory.usage_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.device.write.requests_server_cmaui_3_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - disk.device.write.requests_server_cmaui_3_test_nested3Level
+      disk.write.requests_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.device.read.bytes_server_cmaui
-      disk.device.write.requests.rate_server_cmaui_test_nested3Level_test_nested2Level:
+      - disk.write.requests_server_cmaui_2
+      disk.capacity_server_cmaui_1:
+      - server_cmaui_1
+      - disk.capacity
+      disk.read.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - disk.read.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.write.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.write.requests.rate_server_cmaui_test_nested3Level
-      cpu_util_server_cmaui_test_nested2Level:
+      - disk.write.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level
+      scalable_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - cpu_util_server_cmaui
+      - scalable_server_cmaui_4_test_nested4Level_test_nested3Level
       network.outgoing.packets.rate_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.outgoing.packets.rate_cmaui_port_8_test_nested4Level_test_nested3Level
       network.outpoing.packets_cmaui_port_3_test_nested2Level:
       - test_nested2Level
       - network.outpoing.packets_cmaui_port_3
-      disk.write.requests.rate_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - disk.write.requests.rate_server_cmaui_test_nested4Level_test_nested3Level
-      disk.device.write.bytes_server_cmaui_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - disk.device.write.bytes_server_cmaui_test_nested3Level
-      host_server_cmaui_test_nested2Level:
-      - test_nested2Level
-      - host_server_cmaui
       network.incoming.packets_cmaui_port_6_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.incoming.packets_cmaui_port_6_test_nested3Level
-      memory_server_cmaui_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - memory_server_cmaui_test_nested3Level
       binding_cmaui_port_4_test_nested2Level:
       - test_nested2Level
       - binding_cmaui_port_4
-      disk.device.read.bytes.rate_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.allocation_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.read.bytes.rate_server_cmaui_test_nested3Level
+      - disk.allocation_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.device.read.bytes.rate_server_cmaui_2_test_nested2Level:
+      - test_nested2Level
+      - disk.device.read.bytes.rate_server_cmaui_2
       network.incoming.packets.rate_cmaui_port_4_test_nested2Level:
       - test_nested2Level
       - network.incoming.packets.rate_cmaui_port_4
       feature_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - feature_test_nested4Level_test_nested3Level
-      disk.latency_server_cmaui_test_nested2Level:
-      - test_nested2Level
-      - disk.latency_server_cmaui
-      disk.device.write.requests_server_cmaui_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - disk.device.write.requests_server_cmaui_test_nested3Level
-      vcpus_server_cmaui_test_nested2Level:
+      disk.iops_server_cmaui_1:
+      - server_cmaui_1
+      - disk.iops
+      disk.device.usage_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - vcpus_server_cmaui
+      - disk.device.usage_server_cmaui_2
       feature_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - feature_cmaui_port_8_test_nested4Level_test_nested3Level
-      disk.device.write.bytes.rate_server_cmaui_test_nested3Level_test_nested2Level:
+      cpu.delta_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - cpu.delta_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.device.write.bytes.rate_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.write.bytes.rate_server_cmaui_test_nested3Level
+      - disk.device.write.bytes.rate_server_cmaui_3_test_nested3Level
       network.outgoing.bytes.rate_cmaui_port_2:
       - cmaui_port_2
       - network.outgoing.bytes.rate
-      disk.iops_server_cmaui_test_nested2Level:
-      - test_nested2Level
-      - disk.iops_server_cmaui
       network.outgoing.bytes.rate_cmaui_port_1:
       - cmaui_port_1
       - network.outgoing.bytes.rate
       attachment_cmaui_port_4_test_nested2Level:
       - test_nested2Level
       - attachment_cmaui_port_4
-      memory.usage_server_cmaui_test_nested2Level:
-      - test_nested2Level
-      - memory.usage_server_cmaui
-      disk.iops_server_cmaui:
-      - server_cmaui
-      - disk.iops
       network.outgoing.packets.rate_cmaui_port_5_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.outgoing.packets.rate_cmaui_port_5_test_nested3Level
       network.outgoing.bytes.rate_cmaui_port_4_test_nested2Level:
       - test_nested2Level
       - network.outgoing.bytes.rate_cmaui_port_4
-      disk.read.bytes_server_cmaui:
-      - server_cmaui
-      - disk.read.bytes
-      disk.read.requests_server_cmaui_test_nested2Level:
+      endpoint_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.read.requests_server_cmaui
-      feature_server_cmaui_test_nested3Level_test_nested2Level:
+      - endpoint_server_cmaui_3_test_nested3Level
+      binding_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - feature_server_cmaui_test_nested3Level
-      memory_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - binding_server_cmaui_3_test_nested3Level
+      disk.ephemeral.size_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - memory_server_cmaui_test_nested4Level_test_nested3Level
-      cpu_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - disk.ephemeral.size_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.iops_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - cpu_server_cmaui_test_nested4Level_test_nested3Level
-      disk.write.bytes.rate_server_cmaui:
-      - server_cmaui
-      - disk.write.bytes.rate
-      disk.iops_server_cmaui_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - disk.iops_server_cmaui_test_nested3Level
-      disk.device.read.bytes_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - disk.iops_server_cmaui_2
+      disk.write.bytes_server_cmaui_1:
+      - server_cmaui_1
+      - disk.write.bytes
+      feature_server_cmaui_1:
+      - server_cmaui_1
+      - feature
+      disk.allocation_server_cmaui_1:
+      - server_cmaui_1
+      - disk.allocation
+      disk.iops_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.read.bytes_server_cmaui_test_nested4Level_test_nested3Level
+      - disk.iops_server_cmaui_4_test_nested4Level_test_nested3Level
       network.outgoing.bytes_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.outgoing.bytes_cmaui_port_8_test_nested4Level_test_nested3Level
-      disk.device.read.requests.rate_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - disk.device.read.requests.rate_server_cmaui_test_nested4Level_test_nested3Level
       attachment_cmaui_port_2:
       - cmaui_port_2
       - attachment
-      disk.device.capacity_server_cmaui:
-      - server_cmaui
-      - disk.device.capacity
+      instance_server_cmaui_2_test_nested2Level:
+      - test_nested2Level
+      - instance_server_cmaui_2
       network.outgoing.packets.rate_cmaui_port_1:
       - cmaui_port_1
       - network.outgoing.packets.rate
@@ -792,39 +741,51 @@ topology_template:
       network.incoming.packets.rate_cmaui_port_3_test_nested2Level:
       - test_nested2Level
       - network.incoming.packets.rate_cmaui_port_3
+      disk.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - disk.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level
       attachment_cmaui_port_1:
       - cmaui_port_1
       - attachment
-      disk.device.write.bytes_server_cmaui_test_nested2Level:
-      - test_nested2Level
-      - disk.device.write.bytes_server_cmaui
       network.outgoing.packets.rate_cmaui_port_3_test_nested2Level:
       - test_nested2Level
       - network.outgoing.packets.rate_cmaui_port_3
       network.outgoing.bytes.rate_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.outgoing.bytes.rate_cmaui_port_7_test_nested4Level_test_nested3Level
-      disk.device.read.requests_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.write.requests_server_cmaui_1:
+      - server_cmaui_1
+      - disk.write.requests
+      disk.read.bytes_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.read.requests_server_cmaui_test_nested3Level
+      - disk.read.bytes_server_cmaui_3_test_nested3Level
+      cpu.delta_server_cmaui_3_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - cpu.delta_server_cmaui_3_test_nested3Level
+      disk.usage_server_cmaui_1:
+      - server_cmaui_1
+      - disk.usage
       network.incoming.bytes_cmaui_port_6_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.incoming.bytes_cmaui_port_6_test_nested3Level
-      disk.write.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      memory_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.write.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level
-      disk.read.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - memory_server_cmaui_2
+      disk.usage_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.read.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level
-      memory_server_cmaui:
-      - server_cmaui
-      - memory
-      scalable_server_cmaui_test_nested2Level:
+      - disk.usage_server_cmaui_3_test_nested3Level
+      disk.device.allocation_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - scalable_server_cmaui
-      disk.usage_server_cmaui_test_nested2Level:
+      - disk.device.allocation_server_cmaui_4_test_nested4Level_test_nested3Level
+      os_server_cmaui_1:
+      - server_cmaui_1
+      - os
+      disk.device.latency_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - disk.device.latency_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.root.size_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.usage_server_cmaui
+      - disk.root.size_server_cmaui_2
       feature_cmaui_port_4_test_nested2Level:
       - test_nested2Level
       - feature_cmaui_port_4
@@ -834,51 +795,72 @@ topology_template:
       attachment_cmaui_port_5_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - attachment_cmaui_port_5_test_nested3Level
-      disk.device.capacity_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      cpu_util_server_cmaui_3_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - cpu_util_server_cmaui_3_test_nested3Level
+      disk.device.latency_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.device.capacity_server_cmaui_test_nested4Level_test_nested3Level
-      disk.write.bytes_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - disk.device.latency_server_cmaui_2
+      disk.allocation_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.write.bytes_server_cmaui_test_nested4Level_test_nested3Level
-      memory.resident_server_cmaui_test_nested2Level:
+      - disk.allocation_server_cmaui_3_test_nested3Level
+      disk.ephemeral.size_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - memory.resident_server_cmaui
+      - disk.ephemeral.size_server_cmaui_2
+      disk.usage_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - disk.usage_server_cmaui_4_test_nested4Level_test_nested3Level
       network.outgoing.packets.rate_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.outgoing.packets.rate_cmaui_port_7_test_nested4Level_test_nested3Level
-      host_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      host_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - host_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.capacity_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - host_server_cmaui_test_nested4Level_test_nested3Level
+      - disk.capacity_server_cmaui_3_test_nested3Level
+      host_server_cmaui_1:
+      - server_cmaui_1
+      - host
       feature_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - feature_cmaui_port_7_test_nested4Level_test_nested3Level
-      host_server_cmaui_test_nested3Level_test_nested2Level:
+      binding_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - host_server_cmaui_test_nested3Level
+      - binding_server_cmaui_2
+      cpu.delta_server_cmaui_2_test_nested2Level:
+      - test_nested2Level
+      - cpu.delta_server_cmaui_2
       network.outpoing.packets_cmaui_port_4_test_nested2Level:
       - test_nested2Level
       - network.outpoing.packets_cmaui_port_4
       binding_cmaui_port_3_test_nested2Level:
       - test_nested2Level
       - binding_cmaui_port_3
-      disk.device.write.requests_server_cmaui_test_nested2Level:
+      disk.device.capacity_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.device.write.requests_server_cmaui
-      memory.resident_server_cmaui:
-      - server_cmaui
-      - memory.resident
-      disk.read.bytes.rate_server_cmaui_test_nested2Level:
+      - disk.device.capacity_server_cmaui_2
+      disk.device.write.requests_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.read.bytes.rate_server_cmaui
-      disk.latency_server_cmaui:
-      - server_cmaui
-      - disk.latency
-      disk.allocation_server_cmaui_test_nested2Level:
+      - disk.device.write.requests_server_cmaui_4_test_nested4Level_test_nested3Level
+      memory.usage_server_cmaui_3_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - memory.usage_server_cmaui_3_test_nested3Level
+      scalable_server_cmaui_2_test_nested2Level:
+      - test_nested2Level
+      - scalable_server_cmaui_2
+      host_server_cmaui_3_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - host_server_cmaui_3_test_nested3Level
+      disk.iops_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.allocation_server_cmaui
-      disk.allocation_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - disk.iops_server_cmaui_3_test_nested3Level
+      vcpus_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.allocation_server_cmaui_test_nested4Level_test_nested3Level
+      - vcpus_server_cmaui_2
+      disk.device.read.requests.rate_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.read.requests.rate
       network.outgoing.bytes_cmaui_port_6_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.outgoing.bytes_cmaui_port_6_test_nested3Level
@@ -888,40 +870,58 @@ topology_template:
       network.incoming.bytes.rate_cmaui_port_2:
       - cmaui_port_2
       - network.incoming.bytes.rate
-      disk.write.requests_server_cmaui:
-      - server_cmaui
-      - disk.write.requests
-      cpu.delta_server_cmaui_test_nested2Level:
+      disk.device.read.bytes.rate_server_cmaui_3_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - disk.device.read.bytes.rate_server_cmaui_3_test_nested3Level
+      vcpus_server_cmaui_1:
+      - server_cmaui_1
+      - vcpus
+      disk.write.requests.rate_server_cmaui_2_test_nested2Level:
+      - test_nested2Level
+      - disk.write.requests.rate_server_cmaui_2
+      disk.write.bytes_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - cpu.delta_server_cmaui
+      - disk.write.bytes_server_cmaui_2
       feature_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - feature_test_nested3Level
       feature_cmaui_port_6_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - feature_cmaui_port_6_test_nested3Level
+      disk.device.usage_server_cmaui_3_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - disk.device.usage_server_cmaui_3_test_nested3Level
+      disk.read.bytes.rate_server_cmaui_1:
+      - server_cmaui_1
+      - disk.read.bytes.rate
       network.outgoing.bytes.rate_cmaui_port_3_test_nested2Level:
       - test_nested2Level
       - network.outgoing.bytes.rate_cmaui_port_3
-      memory.resident_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.device.capacity_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - memory.resident_server_cmaui_test_nested4Level_test_nested3Level
+      - disk.device.capacity_server_cmaui_3_test_nested3Level
       network.incoming.bytes.rate_cmaui_port_3_test_nested2Level:
       - test_nested2Level
       - network.incoming.bytes.rate_cmaui_port_3
-      endpoint_server_cmaui:
-      - server_cmaui
-      - endpoint
-      disk.read.requests_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      memory.resident_server_cmaui_1:
+      - server_cmaui_1
+      - memory.resident
+      disk.device.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.read.requests_server_cmaui_test_nested4Level_test_nested3Level
-      disk.allocation_server_cmaui_test_nested3Level_test_nested2Level:
+      - disk.device.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.latency_server_cmaui_1:
+      - server_cmaui_1
+      - disk.latency
+      host_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.allocation_server_cmaui_test_nested3Level
+      - host_server_cmaui_2
+      memory.usage_server_cmaui_1:
+      - server_cmaui_1
+      - memory.usage
     requirements:
-      dependency_server_cmaui:
-      - server_cmaui
-      - dependency
+      local_storage_server_cmaui_2_test_nested2Level:
+      - test_nested2Level
+      - local_storage_server_cmaui_2
       link_cmaui_port_5_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - link_cmaui_port_5_test_nested3Level
@@ -946,42 +946,42 @@ topology_template:
       link_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - link_cmaui_port_7_test_nested4Level_test_nested3Level
-      dependency_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - dependency_server_cmaui_test_nested4Level_test_nested3Level
       dependency_cmaui_port_3_test_nested2Level:
       - test_nested2Level
       - dependency_cmaui_port_3
+      dependency_server_cmaui_2_test_nested2Level:
+      - test_nested2Level
+      - dependency_server_cmaui_2
+      local_storage_server_cmaui_3_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - local_storage_server_cmaui_3_test_nested3Level
       dependency_cmaui_port_1:
       - cmaui_port_1
       - dependency
+      dependency_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - dependency_server_cmaui_4_test_nested4Level_test_nested3Level
       link_cmaui_port_6_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - link_cmaui_port_6_test_nested3Level
-      dependency_server_cmaui_test_nested2Level:
-      - test_nested2Level
-      - dependency_server_cmaui
       dependency_cmaui_port_2:
       - cmaui_port_2
       - dependency
       link_cmaui_port_4_test_nested2Level:
       - test_nested2Level
       - link_cmaui_port_4
-      dependency_cmaui_port_5_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - dependency_cmaui_port_5_test_nested3Level
-      local_storage_server_cmaui:
-      - server_cmaui
-      - local_storage
-      local_storage_server_cmaui_test_nested2Level:
+      local_storage_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - local_storage_server_cmaui
-      dependency_server_cmaui_test_nested3Level_test_nested2Level:
+      - local_storage_server_cmaui_4_test_nested4Level_test_nested3Level
+      dependency_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - dependency_server_cmaui_test_nested3Level
-      local_storage_server_cmaui_test_nested3Level_test_nested2Level:
+      - dependency_server_cmaui_3_test_nested3Level
+      local_storage_server_cmaui_1:
+      - server_cmaui_1
+      - local_storage
+      dependency_cmaui_port_5_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - local_storage_server_cmaui_test_nested3Level
+      - dependency_cmaui_port_5_test_nested3Level
       link_cmaui_port_3_test_nested2Level:
       - test_nested2Level
       - link_cmaui_port_3
@@ -994,9 +994,9 @@ topology_template:
       dependency_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - dependency_test_nested3Level
-      local_storage_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - local_storage_server_cmaui_test_nested4Level_test_nested3Level
+      dependency_server_cmaui_1:
+      - server_cmaui_1
+      - dependency
       dependency_cmaui_port_4_test_nested2Level:
       - test_nested2Level
       - dependency_cmaui_port_4
\ 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/securityrulestoportconnection/sharedNestedMultiLevels/expectedoutputfiles/nested2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/sharedNestedMultiLevels/expectedoutputfiles/nested2ServiceTemplate.yaml
index c2319a006c..2d592aa6e9 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/sharedNestedMultiLevels/expectedoutputfiles/nested2ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/sharedNestedMultiLevels/expectedoutputfiles/nested2ServiceTemplate.yaml
@@ -86,8 +86,21 @@ topology_template:
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
-          node: server_cmaui
+          node: server_cmaui_2
           relationship: tosca.relationships.network.BindsTo
+    server_cmaui_2:
+      type: org.openecomp.resource.vfc.nodes.heat.cmaui
+      properties:
+        flavor:
+          get_input: cmaui_flavor
+        availability_zone:
+          get_input: availability_zone_0
+        image:
+          get_input: cmaui_image
+        name:
+          get_input:
+          - cmaui_names
+          - 0
     cmaui_port_4:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
@@ -113,7 +126,7 @@ topology_template:
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
-          node: server_cmaui
+          node: server_cmaui_2
           relationship: tosca.relationships.network.BindsTo
     test_nested3Level:
       type: org.openecomp.resource.abstract.nodes.heat.nested3
@@ -133,19 +146,6 @@ topology_template:
           - SELF
           - service_template_filter
           - index_value
-    server_cmaui:
-      type: org.openecomp.resource.vfc.nodes.heat.cmaui
-      properties:
-        flavor:
-          get_input: cmaui_flavor
-        availability_zone:
-          get_input: availability_zone_0
-        image:
-          get_input: cmaui_image
-        name:
-          get_input:
-          - cmaui_names
-          - 0
   groups:
     nested2_group:
       type: org.openecomp.groups.heat.HeatStack
@@ -154,510 +154,495 @@ topology_template:
         description: nested2
       members:
       - cmaui_port_3
+      - server_cmaui_2
       - cmaui_port_4
       - test_nested3Level
-      - server_cmaui
   substitution_mappings:
     node_type: org.openecomp.resource.abstract.nodes.heat.nested2
     capabilities:
-      cpu.delta_server_cmaui:
-      - server_cmaui
-      - cpu.delta
-      disk.device.write.requests.rate_server_cmaui:
-      - server_cmaui
-      - disk.device.write.requests.rate
-      disk.write.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.write.bytes.rate_server_cmaui_test_nested4Level
-      vcpus_server_cmaui_test_nested3Level:
+      instance_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - vcpus_server_cmaui
-      disk.device.allocation_server_cmaui:
-      - server_cmaui
-      - disk.device.allocation
-      disk.latency_server_cmaui_test_nested3Level:
+      - instance_server_cmaui_4_test_nested4Level
+      memory.usage_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - disk.latency_server_cmaui
-      disk.device.capacity_server_cmaui_test_nested4Level_test_nested3Level:
+      - memory.usage_server_cmaui_3
+      cpu_util_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - disk.device.capacity_server_cmaui_test_nested4Level
-      scalable_server_cmaui:
-      - server_cmaui
-      - scalable
-      disk.read.bytes.rate_server_cmaui:
-      - server_cmaui
-      - disk.read.bytes.rate
-      memory.resident_server_cmaui_test_nested4Level_test_nested3Level:
+      - cpu_util_server_cmaui_3
+      disk.device.usage_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.usage
+      disk.device.usage_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - memory.resident_server_cmaui_test_nested4Level
+      - disk.device.usage_server_cmaui_4_test_nested4Level
+      disk.device.latency_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.latency
       network.incoming.bytes_cmaui_port_7_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.incoming.bytes_cmaui_port_7_test_nested4Level
-      disk.capacity_server_cmaui_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.capacity_server_cmaui_test_nested4Level
-      host_server_cmaui:
-      - server_cmaui
-      - host
-      cpu_util_server_cmaui:
-      - server_cmaui
-      - cpu_util
-      os_server_cmaui_test_nested3Level:
+      disk.usage_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - os_server_cmaui
-      disk.device.read.bytes_server_cmaui_test_nested4Level_test_nested3Level:
+      - disk.usage_server_cmaui_4_test_nested4Level
+      disk.root.size_server_cmaui_2:
+      - server_cmaui_2
+      - disk.root.size
+      disk.device.write.requests.rate_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.write.requests.rate
+      disk.read.requests_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - disk.device.read.bytes_server_cmaui_test_nested4Level
-      disk.device.read.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level:
+      - disk.read.requests_server_cmaui_3
+      disk.latency_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - disk.device.read.bytes.rate_server_cmaui_test_nested4Level
-      memory.usage_server_cmaui_test_nested4Level_test_nested3Level:
+      - disk.latency_server_cmaui_3
+      disk.write.bytes.rate_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - memory.usage_server_cmaui_test_nested4Level
+      - disk.write.bytes.rate_server_cmaui_3
       network.outgoing.bytes_cmaui_port_3:
       - cmaui_port_3
       - network.outgoing.bytes
-      disk.device.write.requests_server_cmaui:
-      - server_cmaui
-      - disk.device.write.requests
-      instance_server_cmaui_test_nested4Level_test_nested3Level:
+      endpoint_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - endpoint_server_cmaui_4_test_nested4Level
+      disk.read.requests_server_cmaui_2:
+      - server_cmaui_2
+      - disk.read.requests
+      cpu_util_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - instance_server_cmaui_test_nested4Level
-      disk.device.capacity_server_cmaui_test_nested3Level:
+      - cpu_util_server_cmaui_4_test_nested4Level
+      disk.write.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - disk.device.capacity_server_cmaui
+      - disk.write.bytes.rate_server_cmaui_4_test_nested4Level
       feature_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - feature_test_nested4Level
-      disk.read.bytes_server_cmaui_test_nested3Level:
-      - test_nested3Level
-      - disk.read.bytes_server_cmaui
-      disk.device.write.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.device.write.bytes.rate_server_cmaui_test_nested4Level
       network.outgoing.bytes.rate_cmaui_port_8_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.outgoing.bytes.rate_cmaui_port_8_test_nested4Level
-      feature_server_cmaui_test_nested3Level:
+      disk.device.iops_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.iops
+      disk.device.write.bytes_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - feature_server_cmaui
+      - disk.device.write.bytes_server_cmaui_4_test_nested4Level
+      disk.device.capacity_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.capacity
       attachment_cmaui_port_7_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - attachment_cmaui_port_7_test_nested4Level
-      memory.usage_server_cmaui_test_nested3Level:
+      host_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - memory.usage_server_cmaui
-      instance_server_cmaui:
-      - server_cmaui
-      - instance
-      disk.device.read.bytes_server_cmaui:
-      - server_cmaui
+      - host_server_cmaui_4_test_nested4Level
+      disk.device.read.bytes.rate_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.read.bytes.rate
+      disk.ephemeral.size_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - disk.ephemeral.size_server_cmaui_4_test_nested4Level
+      disk.read.bytes_server_cmaui_2:
+      - server_cmaui_2
+      - disk.read.bytes
+      disk.device.read.bytes_server_cmaui_2:
+      - server_cmaui_2
       - disk.device.read.bytes
-      binding_server_cmaui_test_nested3Level:
+      disk.device.capacity_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - binding_server_cmaui
-      disk.root.size_server_cmaui:
-      - server_cmaui
-      - disk.root.size
-      memory_server_cmaui_test_nested3Level:
+      - disk.device.capacity_server_cmaui_4_test_nested4Level
+      disk.root.size_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - disk.root.size_server_cmaui_4_test_nested4Level
+      disk.write.requests.rate_server_cmaui_2:
+      - server_cmaui_2
+      - disk.write.requests.rate
+      disk.iops_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - memory_server_cmaui
+      - disk.iops_server_cmaui_4_test_nested4Level
       network.outgoing.bytes.rate_cmaui_port_5_test_nested3Level:
       - test_nested3Level
       - network.outgoing.bytes.rate_cmaui_port_5
+      memory_server_cmaui_2:
+      - server_cmaui_2
+      - memory
+      cpu_server_cmaui_2:
+      - server_cmaui_2
+      - cpu
+      host_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - host_server_cmaui_3
       network.incoming.packets_cmaui_port_3:
       - cmaui_port_3
       - network.incoming.packets
-      os_server_cmaui:
-      - server_cmaui
-      - os
-      disk.device.write.bytes.rate_server_cmaui:
-      - server_cmaui
-      - disk.device.write.bytes.rate
+      disk.allocation_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - disk.allocation_server_cmaui_3
+      memory_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - memory_server_cmaui_4_test_nested4Level
       network.incoming.packets_cmaui_port_4:
       - cmaui_port_4
       - network.incoming.packets
-      disk.device.latency_server_cmaui_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.device.latency_server_cmaui_test_nested4Level
       network.outgoing.bytes_cmaui_port_6_test_nested3Level:
       - test_nested3Level
       - network.outgoing.bytes_cmaui_port_6
       network.outgoing.bytes_cmaui_port_7_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.outgoing.bytes_cmaui_port_7_test_nested4Level
-      disk.ephemeral.size_server_cmaui_test_nested3Level:
-      - test_nested3Level
-      - disk.ephemeral.size_server_cmaui
       network.incoming.packets.rate_cmaui_port_6_test_nested3Level:
       - test_nested3Level
       - network.incoming.packets.rate_cmaui_port_6
-      disk.write.requests.rate_server_cmaui_test_nested4Level_test_nested3Level:
+      disk.ephemeral.size_server_cmaui_2:
+      - server_cmaui_2
+      - disk.ephemeral.size
+      cpu.delta_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - cpu.delta_server_cmaui_4_test_nested4Level
+      disk.write.requests_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - disk.write.requests.rate_server_cmaui_test_nested4Level
+      - disk.write.requests_server_cmaui_3
       network.outpoing.packets_cmaui_port_5_test_nested3Level:
       - test_nested3Level
       - network.outpoing.packets_cmaui_port_5
-      vcpus_server_cmaui_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - vcpus_server_cmaui_test_nested4Level
+      disk.capacity_server_cmaui_2:
+      - server_cmaui_2
+      - disk.capacity
       network.incoming.packets_cmaui_port_6_test_nested3Level:
       - test_nested3Level
       - network.incoming.packets_cmaui_port_6
-      cpu_util_server_cmaui_test_nested3Level:
-      - test_nested3Level
-      - cpu_util_server_cmaui
       network.incoming.bytes_cmaui_port_8_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.incoming.bytes_cmaui_port_8_test_nested4Level
-      endpoint_server_cmaui_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - endpoint_server_cmaui_test_nested4Level
       network.outgoing.bytes.rate_cmaui_port_6_test_nested3Level:
       - test_nested3Level
       - network.outgoing.bytes.rate_cmaui_port_6
-      disk.allocation_server_cmaui_test_nested3Level:
+      disk.read.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - disk.allocation_server_cmaui
-      memory.resident_server_cmaui_test_nested3Level:
+      - disk.read.bytes.rate_server_cmaui_4_test_nested4Level
+      disk.read.bytes.rate_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - memory.resident_server_cmaui
-      disk.ephemeral.size_server_cmaui_test_nested4Level_test_nested3Level:
+      - disk.read.bytes.rate_server_cmaui_3
+      disk.device.iops_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - disk.ephemeral.size_server_cmaui_test_nested4Level
-      cpu.delta_server_cmaui_test_nested3Level:
-      - test_nested3Level
-      - cpu.delta_server_cmaui
-      disk.device.read.bytes_server_cmaui_test_nested3Level:
-      - test_nested3Level
-      - disk.device.read.bytes_server_cmaui
-      disk.device.read.requests_server_cmaui_test_nested3Level:
-      - test_nested3Level
-      - disk.device.read.requests_server_cmaui
-      disk.write.requests_server_cmaui_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.write.requests_server_cmaui_test_nested4Level
-      feature_server_cmaui:
-      - server_cmaui
-      - feature
+      - disk.device.iops_server_cmaui_4_test_nested4Level
       binding_cmaui_port_3:
       - cmaui_port_3
       - binding
-      disk.device.read.bytes.rate_server_cmaui_test_nested3Level:
-      - test_nested3Level
-      - disk.device.read.bytes.rate_server_cmaui
+      disk.iops_server_cmaui_2:
+      - server_cmaui_2
+      - disk.iops
       binding_cmaui_port_4:
       - cmaui_port_4
       - binding
-      disk.device.write.requests_server_cmaui_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.device.write.requests_server_cmaui_test_nested4Level
-      endpoint_server_cmaui_test_nested3Level:
-      - test_nested3Level
-      - endpoint_server_cmaui
-      disk.device.write.requests_server_cmaui_test_nested3Level:
-      - test_nested3Level
-      - disk.device.write.requests_server_cmaui
-      memory.usage_server_cmaui:
-      - server_cmaui
-      - memory.usage
+      disk.device.write.requests_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.write.requests
       feature_cmaui_port_6_test_nested3Level:
       - test_nested3Level
       - feature_cmaui_port_6
       feature_cmaui_port_8_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - feature_cmaui_port_8_test_nested4Level
-      disk.ephemeral.size_server_cmaui:
-      - server_cmaui
-      - disk.ephemeral.size
+      memory_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - memory_server_cmaui_3
       network.incoming.bytes.rate_cmaui_port_6_test_nested3Level:
       - test_nested3Level
       - network.incoming.bytes.rate_cmaui_port_6
-      memory_server_cmaui_test_nested4Level_test_nested3Level:
+      feature_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - memory_server_cmaui_test_nested4Level
+      - feature_server_cmaui_3
       network.outgoing.bytes.rate_cmaui_port_3:
       - cmaui_port_3
       - network.outgoing.bytes.rate
-      disk.device.usage_server_cmaui_test_nested3Level:
+      disk.device.write.bytes.rate_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - disk.device.write.bytes.rate_server_cmaui_3
+      disk.root.size_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - disk.device.usage_server_cmaui
+      - disk.root.size_server_cmaui_3
       network.outgoing.bytes.rate_cmaui_port_4:
       - cmaui_port_4
       - network.outgoing.bytes.rate
       binding_cmaui_port_6_test_nested3Level:
       - test_nested3Level
       - binding_cmaui_port_6
-      disk.iops_server_cmaui:
-      - server_cmaui
-      - disk.iops
+      disk.usage_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - disk.usage_server_cmaui_3
+      os_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - os_server_cmaui_4_test_nested4Level
+      disk.device.write.requests_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - disk.device.write.requests_server_cmaui_3
       network.incoming.bytes_cmaui_port_4:
       - cmaui_port_4
       - network.incoming.bytes
-      disk.iops_server_cmaui_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.iops_server_cmaui_test_nested4Level
       network.incoming.bytes_cmaui_port_3:
       - cmaui_port_3
       - network.incoming.bytes
-      disk.device.iops_server_cmaui:
-      - server_cmaui
-      - disk.device.iops
-      disk.read.bytes_server_cmaui:
-      - server_cmaui
-      - disk.read.bytes
-      disk.root.size_server_cmaui_test_nested3Level:
+      disk.device.read.requests.rate_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - disk.device.read.requests.rate_server_cmaui_3
+      disk.device.latency_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - disk.device.latency_server_cmaui_3
+      cpu_util_server_cmaui_2:
+      - server_cmaui_2
+      - cpu_util
+      memory.usage_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - memory.usage_server_cmaui_4_test_nested4Level
+      disk.device.write.requests.rate_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - disk.root.size_server_cmaui
+      - disk.device.write.requests.rate_server_cmaui_3
       network.outgoing.bytes_cmaui_port_8_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.outgoing.bytes_cmaui_port_8_test_nested4Level
+      disk.device.write.bytes.rate_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.write.bytes.rate
+      disk.write.bytes.rate_server_cmaui_2:
+      - server_cmaui_2
+      - disk.write.bytes.rate
+      disk.device.read.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - disk.device.read.bytes.rate_server_cmaui_4_test_nested4Level
+      vcpus_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - vcpus_server_cmaui_4_test_nested4Level
       network.outpoing.packets_cmaui_port_8_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.outpoing.packets_cmaui_port_8_test_nested4Level
-      cpu_server_cmaui_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - cpu_server_cmaui_test_nested4Level
+      disk.device.write.bytes_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.write.bytes
       feature_cmaui_port_7_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - feature_cmaui_port_7_test_nested4Level
-      cpu_server_cmaui:
-      - server_cmaui
-      - cpu
+      disk.iops_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - disk.iops_server_cmaui_3
       network.incoming.packets.rate_cmaui_port_3:
       - cmaui_port_3
       - network.incoming.packets.rate
+      cpu_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - cpu_server_cmaui_3
       feature_cmaui_port_3:
       - cmaui_port_3
       - feature
+      disk.write.bytes_server_cmaui_2:
+      - server_cmaui_2
+      - disk.write.bytes
       network.incoming.packets.rate_cmaui_port_4:
       - cmaui_port_4
       - network.incoming.packets.rate
+      feature_server_cmaui_2:
+      - server_cmaui_2
+      - feature
       feature_cmaui_port_4:
       - cmaui_port_4
       - feature
       attachment_cmaui_port_6_test_nested3Level:
       - test_nested3Level
       - attachment_cmaui_port_6
-      disk.write.bytes.rate_server_cmaui:
-      - server_cmaui
-      - disk.write.bytes.rate
-      disk.device.write.bytes_server_cmaui_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.device.write.bytes_server_cmaui_test_nested4Level
       network.outgoing.packets.rate_cmaui_port_6_test_nested3Level:
       - test_nested3Level
       - network.outgoing.packets.rate_cmaui_port_6
-      disk.device.read.bytes.rate_server_cmaui:
-      - server_cmaui
-      - disk.device.read.bytes.rate
+      disk.allocation_server_cmaui_2:
+      - server_cmaui_2
+      - disk.allocation
+      disk.device.allocation_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - disk.device.allocation_server_cmaui_4_test_nested4Level
+      binding_server_cmaui_2:
+      - server_cmaui_2
+      - binding
+      vcpus_server_cmaui_2:
+      - server_cmaui_2
+      - vcpus
       network.outgoing.packets.rate_cmaui_port_4:
       - cmaui_port_4
       - network.outgoing.packets.rate
-      disk.write.requests.rate_server_cmaui_test_nested3Level:
+      instance_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - disk.write.requests.rate_server_cmaui
+      - instance_server_cmaui_3
       attachment_cmaui_port_3:
       - cmaui_port_3
       - attachment
-      disk.write.bytes_server_cmaui_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.write.bytes_server_cmaui_test_nested4Level
       attachment_cmaui_port_4:
       - cmaui_port_4
       - attachment
-      disk.iops_server_cmaui_test_nested3Level:
-      - test_nested3Level
-      - disk.iops_server_cmaui
-      host_server_cmaui_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - host_server_cmaui_test_nested4Level
-      disk.device.latency_server_cmaui:
-      - server_cmaui
-      - disk.device.latency
-      disk.read.requests_server_cmaui:
-      - server_cmaui
-      - disk.read.requests
-      disk.device.allocation_server_cmaui_test_nested3Level:
+      scalable_server_cmaui_2:
+      - server_cmaui_2
+      - scalable
+      disk.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - disk.device.allocation_server_cmaui
-      disk.device.read.requests_server_cmaui_test_nested4Level_test_nested3Level:
+      - disk.write.requests.rate_server_cmaui_4_test_nested4Level
+      disk.capacity_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - disk.device.read.requests_server_cmaui_test_nested4Level
-      disk.device.capacity_server_cmaui:
-      - server_cmaui
-      - disk.device.capacity
-      disk.usage_server_cmaui:
-      - server_cmaui
-      - disk.usage
+      - disk.capacity_server_cmaui_4_test_nested4Level
       network.outgoing.packets.rate_cmaui_port_3:
       - cmaui_port_3
       - network.outgoing.packets.rate
-      disk.device.usage_server_cmaui:
-      - server_cmaui
-      - disk.device.usage
-      disk.device.iops_server_cmaui_test_nested3Level:
+      disk.device.read.bytes.rate_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - disk.device.iops_server_cmaui
+      - disk.device.read.bytes.rate_server_cmaui_3
       network.incoming.packets.rate_cmaui_port_5_test_nested3Level:
       - test_nested3Level
       - network.incoming.packets.rate_cmaui_port_5
-      disk.allocation_server_cmaui_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.allocation_server_cmaui_test_nested4Level
-      disk.capacity_server_cmaui:
-      - server_cmaui
-      - disk.capacity
-      disk.write.requests.rate_server_cmaui:
-      - server_cmaui
-      - disk.write.requests.rate
-      os_server_cmaui_test_nested4Level_test_nested3Level:
+      disk.write.requests_server_cmaui_2:
+      - server_cmaui_2
+      - disk.write.requests
+      memory.resident_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - os_server_cmaui_test_nested4Level
+      - memory.resident_server_cmaui_4_test_nested4Level
       network.outpoing.packets_cmaui_port_7_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.outpoing.packets_cmaui_port_7_test_nested4Level
-      disk.device.latency_server_cmaui_test_nested3Level:
+      disk.usage_server_cmaui_2:
+      - server_cmaui_2
+      - disk.usage
+      disk.device.usage_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - disk.device.usage_server_cmaui_3
+      disk.write.bytes_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - disk.write.bytes_server_cmaui_3
+      feature_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - disk.device.latency_server_cmaui
+      - feature_server_cmaui_4_test_nested4Level
       network.incoming.bytes.rate_cmaui_port_8_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.incoming.bytes.rate_cmaui_port_8_test_nested4Level
       binding_cmaui_port_7_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - binding_cmaui_port_7_test_nested4Level
-      disk.root.size_server_cmaui_test_nested4Level_test_nested3Level:
+      disk.write.requests.rate_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - disk.root.size_server_cmaui_test_nested4Level
-      disk.device.read.requests_server_cmaui:
-      - server_cmaui
-      - disk.device.read.requests
+      - disk.write.requests.rate_server_cmaui_3
+      disk.device.read.bytes_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - disk.device.read.bytes_server_cmaui_4_test_nested4Level
+      endpoint_server_cmaui_2:
+      - server_cmaui_2
+      - endpoint
       network.incoming.bytes_cmaui_port_6_test_nested3Level:
       - test_nested3Level
       - network.incoming.bytes_cmaui_port_6
-      memory_server_cmaui:
-      - server_cmaui
-      - memory
-      disk.read.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level:
+      os_server_cmaui_2:
+      - server_cmaui_2
+      - os
+      disk.read.requests_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - disk.read.bytes.rate_server_cmaui_test_nested4Level
-      disk.read.requests_server_cmaui_test_nested3Level:
+      - disk.read.requests_server_cmaui_4_test_nested4Level
+      scalable_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - disk.read.requests_server_cmaui
+      - scalable_server_cmaui_4_test_nested4Level
       network.incoming.packets.rate_cmaui_port_8_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.incoming.packets.rate_cmaui_port_8_test_nested4Level
-      binding_server_cmaui:
-      - server_cmaui
-      - binding
-      disk.device.usage_server_cmaui_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.device.usage_server_cmaui_test_nested4Level
-      disk.device.read.requests.rate_server_cmaui_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.device.read.requests.rate_server_cmaui_test_nested4Level
-      disk.device.write.requests.rate_server_cmaui_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.device.write.requests.rate_server_cmaui_test_nested4Level
       attachment_cmaui_port_5_test_nested3Level:
       - test_nested3Level
       - attachment_cmaui_port_5
-      disk.device.read.requests.rate_server_cmaui:
-      - server_cmaui
-      - disk.device.read.requests.rate
-      feature_server_cmaui_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - feature_server_cmaui_test_nested4Level
-      binding_server_cmaui_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - binding_server_cmaui_test_nested4Level
+      disk.device.allocation_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.allocation
       network.incoming.packets_cmaui_port_7_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.incoming.packets_cmaui_port_7_test_nested4Level
-      disk.read.bytes_server_cmaui_test_nested4Level_test_nested3Level:
+      disk.device.latency_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - disk.read.bytes_server_cmaui_test_nested4Level
-      disk.write.bytes_server_cmaui:
-      - server_cmaui
-      - disk.write.bytes
-      host_server_cmaui_test_nested3Level:
+      - disk.device.latency_server_cmaui_4_test_nested4Level
+      disk.read.bytes_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - disk.read.bytes_server_cmaui_3
+      disk.latency_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - host_server_cmaui
-      scalable_server_cmaui_test_nested4Level_test_nested3Level:
+      - disk.latency_server_cmaui_4_test_nested4Level
+      disk.device.allocation_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - scalable_server_cmaui_test_nested4Level
+      - disk.device.allocation_server_cmaui_3
       network.incoming.bytes.rate_cmaui_port_5_test_nested3Level:
       - test_nested3Level
       - network.incoming.bytes.rate_cmaui_port_5
+      host_server_cmaui_2:
+      - server_cmaui_2
+      - host
+      os_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - os_server_cmaui_3
+      disk.read.bytes_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - disk.read.bytes_server_cmaui_4_test_nested4Level
+      disk.write.requests_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - disk.write.requests_server_cmaui_4_test_nested4Level
       network.incoming.packets_cmaui_port_8_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.incoming.packets_cmaui_port_8_test_nested4Level
+      binding_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - binding_server_cmaui_3
       feature_test_nested3Level:
       - test_nested3Level
       - feature
-      disk.device.write.bytes_server_cmaui_test_nested3Level:
-      - test_nested3Level
-      - disk.device.write.bytes_server_cmaui
       network.outgoing.packets.rate_cmaui_port_8_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.outgoing.packets.rate_cmaui_port_8_test_nested4Level
-      attachment_cmaui_port_8_test_nested4Level_test_nested3Level:
+      cpu_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - attachment_cmaui_port_8_test_nested4Level
-      disk.read.bytes.rate_server_cmaui_test_nested3Level:
+      - cpu_server_cmaui_4_test_nested4Level
+      cpu.delta_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - cpu.delta_server_cmaui_3
+      disk.device.capacity_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - disk.read.bytes.rate_server_cmaui
-      disk.device.write.bytes.rate_server_cmaui_test_nested3Level:
+      - disk.device.capacity_server_cmaui_3
+      disk.device.write.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - disk.device.write.bytes.rate_server_cmaui
-      disk.device.write.requests.rate_server_cmaui_test_nested3Level:
+      - disk.device.write.bytes.rate_server_cmaui_4_test_nested4Level
+      attachment_cmaui_port_8_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - disk.device.write.requests.rate_server_cmaui
-      disk.capacity_server_cmaui_test_nested3Level:
+      - attachment_cmaui_port_8_test_nested4Level
+      scalable_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - disk.capacity_server_cmaui
-      disk.usage_server_cmaui_test_nested4Level_test_nested3Level:
+      - scalable_server_cmaui_3
+      instance_server_cmaui_2:
+      - server_cmaui_2
+      - instance
+      disk.device.iops_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - disk.usage_server_cmaui_test_nested4Level
+      - disk.device.iops_server_cmaui_3
       network.outgoing.bytes.rate_cmaui_port_7_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.outgoing.bytes.rate_cmaui_port_7_test_nested4Level
-      memory.resident_server_cmaui:
-      - server_cmaui
-      - memory.resident
       network.incoming.bytes_cmaui_port_5_test_nested3Level:
       - test_nested3Level
       - network.incoming.bytes_cmaui_port_5
-      disk.device.allocation_server_cmaui_test_nested4Level_test_nested3Level:
+      endpoint_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - endpoint_server_cmaui_3
+      vcpus_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - disk.device.allocation_server_cmaui_test_nested4Level
+      - vcpus_server_cmaui_3
       network.incoming.packets.rate_cmaui_port_7_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.incoming.packets.rate_cmaui_port_7_test_nested4Level
-      disk.write.requests_server_cmaui_test_nested3Level:
+      disk.allocation_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - disk.write.requests_server_cmaui
-      disk.latency_server_cmaui:
-      - server_cmaui
-      - disk.latency
+      - disk.allocation_server_cmaui_4_test_nested4Level
       network.outpoing.packets_cmaui_port_6_test_nested3Level:
       - test_nested3Level
       - network.outpoing.packets_cmaui_port_6
-      vcpus_server_cmaui:
-      - server_cmaui
-      - vcpus
       network.outgoing.bytes_cmaui_port_4:
       - cmaui_port_4
       - network.outgoing.bytes
       network.outgoing.packets.rate_cmaui_port_7_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.outgoing.packets.rate_cmaui_port_7_test_nested4Level
-      disk.device.write.bytes_server_cmaui:
-      - server_cmaui
-      - disk.device.write.bytes
-      instance_server_cmaui_test_nested3Level:
-      - test_nested3Level
-      - instance_server_cmaui
       binding_cmaui_port_5_test_nested3Level:
       - test_nested3Level
       - binding_cmaui_port_5
@@ -667,91 +652,106 @@ topology_template:
       network.incoming.bytes.rate_cmaui_port_4:
       - cmaui_port_4
       - network.incoming.bytes.rate
+      disk.device.write.bytes_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - disk.device.write.bytes_server_cmaui_3
       network.outgoing.bytes_cmaui_port_5_test_nested3Level:
       - test_nested3Level
       - network.outgoing.bytes_cmaui_port_5
-      cpu_util_server_cmaui_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - cpu_util_server_cmaui_test_nested4Level
-      disk.allocation_server_cmaui:
-      - server_cmaui
-      - disk.allocation
-      disk.write.requests_server_cmaui:
-      - server_cmaui
-      - disk.write.requests
-      cpu_server_cmaui_test_nested3Level:
-      - test_nested3Level
-      - cpu_server_cmaui
-      disk.usage_server_cmaui_test_nested3Level:
-      - test_nested3Level
-      - disk.usage_server_cmaui
-      disk.write.bytes_server_cmaui_test_nested3Level:
+      disk.device.read.requests_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.read.requests
+      disk.device.read.requests_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - disk.write.bytes_server_cmaui
+      - disk.device.read.requests_server_cmaui_4_test_nested4Level
+      disk.read.bytes.rate_server_cmaui_2:
+      - server_cmaui_2
+      - disk.read.bytes.rate
       network.outpoing.packets_cmaui_port_3:
       - cmaui_port_3
       - network.outpoing.packets
+      disk.device.write.requests_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - disk.device.write.requests_server_cmaui_4_test_nested4Level
+      disk.capacity_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - disk.capacity_server_cmaui_3
+      cpu.delta_server_cmaui_2:
+      - server_cmaui_2
+      - cpu.delta
+      disk.device.read.requests.rate_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.read.requests.rate
       network.outpoing.packets_cmaui_port_4:
       - cmaui_port_4
       - network.outpoing.packets
+      binding_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - binding_server_cmaui_4_test_nested4Level
       network.incoming.bytes.rate_cmaui_port_7_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.incoming.bytes.rate_cmaui_port_7_test_nested4Level
+      memory.resident_server_cmaui_2:
+      - server_cmaui_2
+      - memory.resident
+      disk.device.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - disk.device.write.requests.rate_server_cmaui_4_test_nested4Level
       binding_cmaui_port_8_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - binding_cmaui_port_8_test_nested4Level
-      scalable_server_cmaui_test_nested3Level:
+      disk.write.bytes_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - scalable_server_cmaui
-      endpoint_server_cmaui:
-      - server_cmaui
-      - endpoint
+      - disk.write.bytes_server_cmaui_4_test_nested4Level
+      disk.device.read.requests_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - disk.device.read.requests_server_cmaui_3
       feature_cmaui_port_5_test_nested3Level:
       - test_nested3Level
       - feature_cmaui_port_5
-      cpu.delta_server_cmaui_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - cpu.delta_server_cmaui_test_nested4Level
       network.incoming.packets_cmaui_port_5_test_nested3Level:
       - test_nested3Level
       - network.incoming.packets_cmaui_port_5
-      disk.device.iops_server_cmaui_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.device.iops_server_cmaui_test_nested4Level
-      disk.write.bytes.rate_server_cmaui_test_nested3Level:
-      - test_nested3Level
-      - disk.write.bytes.rate_server_cmaui
-      disk.device.read.requests.rate_server_cmaui_test_nested3Level:
-      - test_nested3Level
-      - disk.device.read.requests.rate_server_cmaui
-      disk.read.requests_server_cmaui_test_nested4Level_test_nested3Level:
+      disk.latency_server_cmaui_2:
+      - server_cmaui_2
+      - disk.latency
+      disk.ephemeral.size_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - disk.read.requests_server_cmaui_test_nested4Level
+      - disk.ephemeral.size_server_cmaui_3
       network.outgoing.packets.rate_cmaui_port_5_test_nested3Level:
       - test_nested3Level
       - network.outgoing.packets.rate_cmaui_port_5
-      disk.latency_server_cmaui_test_nested4Level_test_nested3Level:
+      disk.device.read.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - disk.device.read.requests.rate_server_cmaui_4_test_nested4Level
+      disk.device.read.bytes_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - disk.device.read.bytes_server_cmaui_3
+      memory.resident_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - disk.latency_server_cmaui_test_nested4Level
+      - memory.resident_server_cmaui_3
+      memory.usage_server_cmaui_2:
+      - server_cmaui_2
+      - memory.usage
     requirements:
       link_cmaui_port_5_test_nested3Level:
       - test_nested3Level
       - link_cmaui_port_5
-      dependency_server_cmaui_test_nested3Level:
+      dependency_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - dependency_server_cmaui_4_test_nested4Level
+      local_storage_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - dependency_server_cmaui
+      - local_storage_server_cmaui_3
       dependency_cmaui_port_6_test_nested3Level:
       - test_nested3Level
       - dependency_cmaui_port_6
-      dependency_server_cmaui:
-      - server_cmaui
-      - dependency
       dependency_cmaui_port_7_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - dependency_cmaui_port_7_test_nested4Level
-      local_storage_server_cmaui_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - local_storage_server_cmaui_test_nested4Level
+      local_storage_server_cmaui_2:
+      - server_cmaui_2
+      - local_storage
       dependency_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - dependency_test_nested4Level
@@ -761,18 +761,18 @@ topology_template:
       link_cmaui_port_3:
       - cmaui_port_3
       - link
-      local_storage_server_cmaui:
-      - server_cmaui
-      - local_storage
-      dependency_server_cmaui_test_nested4Level_test_nested3Level:
+      dependency_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - dependency_server_cmaui_test_nested4Level
+      - dependency_server_cmaui_3
       link_cmaui_port_6_test_nested3Level:
       - test_nested3Level
       - link_cmaui_port_6
       link_cmaui_port_8_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - link_cmaui_port_8_test_nested4Level
+      local_storage_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - local_storage_server_cmaui_4_test_nested4Level
       dependency_test_nested3Level:
       - test_nested3Level
       - dependency
@@ -782,6 +782,9 @@ topology_template:
       dependency_cmaui_port_8_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - dependency_cmaui_port_8_test_nested4Level
+      dependency_server_cmaui_2:
+      - server_cmaui_2
+      - dependency
       dependency_cmaui_port_4:
       - cmaui_port_4
       - dependency
@@ -790,7 +793,4 @@ topology_template:
       - dependency
       dependency_cmaui_port_5_test_nested3Level:
       - test_nested3Level
-      - dependency_cmaui_port_5
-      local_storage_server_cmaui_test_nested3Level:
-      - test_nested3Level
-      - local_storage_server_cmaui
\ No newline at end of file
+      - dependency_cmaui_port_5
\ 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/securityrulestoportconnection/sharedNestedMultiLevels/expectedoutputfiles/nested3ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/sharedNestedMultiLevels/expectedoutputfiles/nested3ServiceTemplate.yaml
index d907a4db05..9bc5ccc78a 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/sharedNestedMultiLevels/expectedoutputfiles/nested3ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/sharedNestedMultiLevels/expectedoutputfiles/nested3ServiceTemplate.yaml
@@ -74,6 +74,19 @@ topology_template:
           substitute_service_template: nested4ServiceTemplate.yaml
         p2:
           get_input: p2
+    server_cmaui_3:
+      type: org.openecomp.resource.vfc.nodes.heat.cmaui
+      properties:
+        flavor:
+          get_input: cmaui_flavor
+        availability_zone:
+          get_input: availability_zone_0
+        image:
+          get_input: cmaui_image
+        name:
+          get_input:
+          - cmaui_names
+          - 0
     cmaui_port_5:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
@@ -99,7 +112,7 @@ topology_template:
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
-          node: server_cmaui
+          node: server_cmaui_3
           relationship: tosca.relationships.network.BindsTo
     cmaui_port_6:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
@@ -126,21 +139,8 @@ topology_template:
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
-          node: server_cmaui
+          node: server_cmaui_3
           relationship: tosca.relationships.network.BindsTo
-    server_cmaui:
-      type: org.openecomp.resource.vfc.nodes.heat.cmaui
-      properties:
-        flavor:
-          get_input: cmaui_flavor
-        availability_zone:
-          get_input: availability_zone_0
-        image:
-          get_input: cmaui_image
-        name:
-          get_input:
-          - cmaui_names
-          - 0
   groups:
     nested3_group:
       type: org.openecomp.groups.heat.HeatStack
@@ -149,135 +149,144 @@ topology_template:
         description: nested3
       members:
       - test_nested4Level
+      - server_cmaui_3
       - cmaui_port_5
       - cmaui_port_6
-      - server_cmaui
   substitution_mappings:
     node_type: org.openecomp.resource.abstract.nodes.heat.nested3
     capabilities:
-      cpu.delta_server_cmaui:
-      - server_cmaui
-      - cpu.delta
-      disk.device.write.requests.rate_server_cmaui:
-      - server_cmaui
-      - disk.device.write.requests.rate
-      disk.device.allocation_server_cmaui:
-      - server_cmaui
-      - disk.device.allocation
-      memory_server_cmaui_test_nested4Level:
+      memory.usage_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - memory_server_cmaui
-      scalable_server_cmaui:
-      - server_cmaui
-      - scalable
-      disk.read.bytes.rate_server_cmaui:
-      - server_cmaui
-      - disk.read.bytes.rate
-      instance_server_cmaui_test_nested4Level:
-      - test_nested4Level
-      - instance_server_cmaui
-      disk.root.size_server_cmaui_test_nested4Level:
+      - memory.usage_server_cmaui_4
+      cpu_util_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.root.size_server_cmaui
-      disk.write.bytes_server_cmaui_test_nested4Level:
-      - test_nested4Level
-      - disk.write.bytes_server_cmaui
-      host_server_cmaui:
-      - server_cmaui
-      - host
-      cpu_util_server_cmaui:
-      - server_cmaui
-      - cpu_util
-      cpu_server_cmaui_test_nested4Level:
+      - cpu_util_server_cmaui_4
+      disk.device.usage_server_cmaui_3:
+      - server_cmaui_3
+      - disk.device.usage
+      disk.device.latency_server_cmaui_3:
+      - server_cmaui_3
+      - disk.device.latency
+      disk.read.requests_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - cpu_server_cmaui
-      vcpus_server_cmaui_test_nested4Level:
+      - disk.read.requests_server_cmaui_4
+      disk.root.size_server_cmaui_3:
+      - server_cmaui_3
+      - disk.root.size
+      disk.device.write.requests.rate_server_cmaui_3:
+      - server_cmaui_3
+      - disk.device.write.requests.rate
+      disk.write.bytes.rate_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - vcpus_server_cmaui
-      disk.device.usage_server_cmaui_test_nested4Level:
+      - disk.write.bytes.rate_server_cmaui_4
+      disk.latency_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.device.usage_server_cmaui
-      disk.device.write.requests_server_cmaui:
-      - server_cmaui
-      - disk.device.write.requests
+      - disk.latency_server_cmaui_4
+      disk.read.requests_server_cmaui_3:
+      - server_cmaui_3
+      - disk.read.requests
+      disk.device.iops_server_cmaui_3:
+      - server_cmaui_3
+      - disk.device.iops
+      disk.device.capacity_server_cmaui_3:
+      - server_cmaui_3
+      - disk.device.capacity
+      disk.device.read.bytes.rate_server_cmaui_3:
+      - server_cmaui_3
+      - disk.device.read.bytes.rate
       network.incoming.bytes.rate_cmaui_port_7_test_nested4Level:
       - test_nested4Level
       - network.incoming.bytes.rate_cmaui_port_7
-      instance_server_cmaui:
-      - server_cmaui
-      - instance
-      disk.latency_server_cmaui_test_nested4Level:
+      feature_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.latency_server_cmaui
-      disk.device.read.bytes_server_cmaui:
-      - server_cmaui
-      - disk.device.read.bytes
-      disk.device.capacity_server_cmaui_test_nested4Level:
+      - feature_server_cmaui_4
+      disk.capacity_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.device.capacity_server_cmaui
+      - disk.capacity_server_cmaui_4
+      disk.read.bytes_server_cmaui_3:
+      - server_cmaui_3
+      - disk.read.bytes
       network.incoming.bytes.rate_cmaui_port_8_test_nested4Level:
       - test_nested4Level
       - network.incoming.bytes.rate_cmaui_port_8
-      disk.root.size_server_cmaui:
-      - server_cmaui
-      - disk.root.size
-      host_server_cmaui_test_nested4Level:
+      disk.device.write.bytes.rate_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - host_server_cmaui
-      os_server_cmaui:
-      - server_cmaui
-      - os
-      disk.device.write.bytes.rate_server_cmaui:
-      - server_cmaui
-      - disk.device.write.bytes.rate
-      disk.device.read.requests.rate_server_cmaui_test_nested4Level:
+      - disk.device.write.bytes.rate_server_cmaui_4
+      disk.device.read.requests_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.device.read.requests.rate_server_cmaui
+      - disk.device.read.requests_server_cmaui_4
+      disk.device.write.requests_server_cmaui_4_test_nested4Level:
+      - test_nested4Level
+      - disk.device.write.requests_server_cmaui_4
+      disk.write.requests.rate_server_cmaui_3:
+      - server_cmaui_3
+      - disk.write.requests.rate
+      disk.device.write.requests.rate_server_cmaui_4_test_nested4Level:
+      - test_nested4Level
+      - disk.device.write.requests.rate_server_cmaui_4
+      disk.device.read.bytes_server_cmaui_4_test_nested4Level:
+      - test_nested4Level
+      - disk.device.read.bytes_server_cmaui_4
+      disk.device.read.bytes_server_cmaui_3:
+      - server_cmaui_3
+      - disk.device.read.bytes
+      memory_server_cmaui_3:
+      - server_cmaui_3
+      - memory
+      memory.resident_server_cmaui_4_test_nested4Level:
+      - test_nested4Level
+      - memory.resident_server_cmaui_4
+      cpu_server_cmaui_3:
+      - server_cmaui_3
+      - cpu
+      binding_server_cmaui_4_test_nested4Level:
+      - test_nested4Level
+      - binding_server_cmaui_4
       network.incoming.packets_cmaui_port_5:
       - cmaui_port_5
       - network.incoming.packets
+      os_server_cmaui_4_test_nested4Level:
+      - test_nested4Level
+      - os_server_cmaui_4
       network.incoming.packets.rate_cmaui_port_7_test_nested4Level:
       - test_nested4Level
       - network.incoming.packets.rate_cmaui_port_7
-      disk.allocation_server_cmaui_test_nested4Level:
+      disk.ephemeral.size_server_cmaui_3:
+      - server_cmaui_3
+      - disk.ephemeral.size
+      cpu.delta_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.allocation_server_cmaui
+      - cpu.delta_server_cmaui_4
       network.incoming.packets_cmaui_port_6:
       - cmaui_port_6
       - network.incoming.packets
-      disk.device.write.bytes.rate_server_cmaui_test_nested4Level:
+      disk.capacity_server_cmaui_3:
+      - server_cmaui_3
+      - disk.capacity
+      disk.device.capacity_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.device.write.bytes.rate_server_cmaui
+      - disk.device.capacity_server_cmaui_4
       network.outgoing.bytes.rate_cmaui_port_7_test_nested4Level:
       - test_nested4Level
       - network.outgoing.bytes.rate_cmaui_port_7
-      disk.device.write.bytes_server_cmaui_test_nested4Level:
-      - test_nested4Level
-      - disk.device.write.bytes_server_cmaui
-      disk.device.write.requests.rate_server_cmaui_test_nested4Level:
+      scalable_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.device.write.requests.rate_server_cmaui
-      disk.device.iops_server_cmaui_test_nested4Level:
+      - scalable_server_cmaui_4
+      disk.device.iops_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.device.iops_server_cmaui
-      disk.read.requests_server_cmaui_test_nested4Level:
+      - disk.device.iops_server_cmaui_4
+      disk.read.bytes.rate_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.read.requests_server_cmaui
-      disk.ephemeral.size_server_cmaui_test_nested4Level:
+      - disk.read.bytes.rate_server_cmaui_4
+      endpoint_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.ephemeral.size_server_cmaui
-      binding_server_cmaui_test_nested4Level:
-      - test_nested4Level
-      - binding_server_cmaui
+      - endpoint_server_cmaui_4
       network.outgoing.bytes_cmaui_port_8_test_nested4Level:
       - test_nested4Level
       - network.outgoing.bytes_cmaui_port_8
-      disk.usage_server_cmaui_test_nested4Level:
+      vcpus_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.usage_server_cmaui
-      feature_server_cmaui:
-      - server_cmaui
-      - feature
+      - vcpus_server_cmaui_4
       binding_cmaui_port_5:
       - cmaui_port_5
       - binding
@@ -287,21 +296,21 @@ topology_template:
       binding_cmaui_port_6:
       - cmaui_port_6
       - binding
+      disk.device.write.requests_server_cmaui_3:
+      - server_cmaui_3
+      - disk.device.write.requests
       network.outgoing.packets.rate_cmaui_port_8_test_nested4Level:
       - test_nested4Level
       - network.outgoing.packets.rate_cmaui_port_8
-      memory.usage_server_cmaui:
-      - server_cmaui
-      - memory.usage
-      disk.ephemeral.size_server_cmaui:
-      - server_cmaui
-      - disk.ephemeral.size
-      feature_server_cmaui_test_nested4Level:
+      disk.write.bytes_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - feature_server_cmaui
-      disk.read.bytes.rate_server_cmaui_test_nested4Level:
+      - disk.write.bytes_server_cmaui_4
+      disk.write.requests.rate_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.read.bytes.rate_server_cmaui
+      - disk.write.requests.rate_server_cmaui_4
+      disk.iops_server_cmaui_3:
+      - server_cmaui_3
+      - disk.iops
       network.outgoing.bytes.rate_cmaui_port_6:
       - cmaui_port_6
       - network.outgoing.bytes.rate
@@ -314,75 +323,78 @@ topology_template:
       network.incoming.bytes_cmaui_port_5:
       - cmaui_port_5
       - network.incoming.bytes
-      disk.iops_server_cmaui:
-      - server_cmaui
-      - disk.iops
-      disk.device.iops_server_cmaui:
-      - server_cmaui
-      - disk.device.iops
-      disk.capacity_server_cmaui_test_nested4Level:
-      - test_nested4Level
-      - disk.capacity_server_cmaui
-      disk.read.bytes_server_cmaui:
-      - server_cmaui
-      - disk.read.bytes
-      scalable_server_cmaui_test_nested4Level:
+      host_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - scalable_server_cmaui
+      - host_server_cmaui_4
+      cpu_util_server_cmaui_3:
+      - server_cmaui_3
+      - cpu_util
+      disk.device.write.bytes.rate_server_cmaui_3:
+      - server_cmaui_3
+      - disk.device.write.bytes.rate
+      disk.write.bytes.rate_server_cmaui_3:
+      - server_cmaui_3
+      - disk.write.bytes.rate
+      disk.device.write.bytes_server_cmaui_3:
+      - server_cmaui_3
+      - disk.device.write.bytes
       network.incoming.bytes_cmaui_port_8_test_nested4Level:
       - test_nested4Level
       - network.incoming.bytes_cmaui_port_8
       network.outpoing.packets_cmaui_port_8_test_nested4Level:
       - test_nested4Level
       - network.outpoing.packets_cmaui_port_8
-      disk.device.read.bytes.rate_server_cmaui_test_nested4Level:
+      disk.iops_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.device.read.bytes.rate_server_cmaui
+      - disk.iops_server_cmaui_4
+      feature_server_cmaui_3:
+      - server_cmaui_3
+      - feature
       feature_cmaui_port_5:
       - cmaui_port_5
       - feature
-      disk.device.allocation_server_cmaui_test_nested4Level:
-      - test_nested4Level
-      - disk.device.allocation_server_cmaui
       feature_cmaui_port_6:
       - cmaui_port_6
       - feature
-      disk.device.write.requests_server_cmaui_test_nested4Level:
-      - test_nested4Level
-      - disk.device.write.requests_server_cmaui
-      cpu_server_cmaui:
-      - server_cmaui
-      - cpu
-      disk.write.bytes.rate_server_cmaui_test_nested4Level:
+      cpu_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.write.bytes.rate_server_cmaui
+      - cpu_server_cmaui_4
       attachment_cmaui_port_7_test_nested4Level:
       - test_nested4Level
       - attachment_cmaui_port_7
-      disk.write.requests.rate_server_cmaui_test_nested4Level:
-      - test_nested4Level
-      - disk.write.requests.rate_server_cmaui
       binding_cmaui_port_8_test_nested4Level:
       - test_nested4Level
       - binding_cmaui_port_8
+      disk.write.bytes_server_cmaui_3:
+      - server_cmaui_3
+      - disk.write.bytes
       network.incoming.packets.rate_cmaui_port_5:
       - cmaui_port_5
       - network.incoming.packets.rate
-      disk.write.bytes.rate_server_cmaui:
-      - server_cmaui
-      - disk.write.bytes.rate
-      disk.device.read.bytes.rate_server_cmaui:
-      - server_cmaui
-      - disk.device.read.bytes.rate
+      disk.allocation_server_cmaui_3:
+      - server_cmaui_3
+      - disk.allocation
       attachment_cmaui_port_6:
       - cmaui_port_6
       - attachment
+      binding_server_cmaui_3:
+      - server_cmaui_3
+      - binding
+      vcpus_server_cmaui_3:
+      - server_cmaui_3
+      - vcpus
       network.outgoing.packets.rate_cmaui_port_7_test_nested4Level:
       - test_nested4Level
       - network.outgoing.packets.rate_cmaui_port_7
+      instance_server_cmaui_4_test_nested4Level:
+      - test_nested4Level
+      - instance_server_cmaui_4
       network.outgoing.packets.rate_cmaui_port_5:
       - cmaui_port_5
       - network.outgoing.packets.rate
+      scalable_server_cmaui_3:
+      - server_cmaui_3
+      - scalable
       network.outgoing.packets.rate_cmaui_port_6:
       - cmaui_port_6
       - network.outgoing.packets.rate
@@ -392,166 +404,154 @@ topology_template:
       feature_cmaui_port_8_test_nested4Level:
       - test_nested4Level
       - feature_cmaui_port_8
-      disk.device.latency_server_cmaui:
-      - server_cmaui
-      - disk.device.latency
-      disk.read.requests_server_cmaui:
-      - server_cmaui
-      - disk.read.requests
-      disk.device.capacity_server_cmaui:
-      - server_cmaui
-      - disk.device.capacity
-      disk.usage_server_cmaui:
-      - server_cmaui
-      - disk.usage
-      disk.device.usage_server_cmaui:
-      - server_cmaui
-      - disk.device.usage
+      disk.write.requests_server_cmaui_3:
+      - server_cmaui_3
+      - disk.write.requests
       network.outpoing.packets_cmaui_port_7_test_nested4Level:
       - test_nested4Level
       - network.outpoing.packets_cmaui_port_7
-      disk.capacity_server_cmaui:
-      - server_cmaui
-      - disk.capacity
-      disk.write.requests.rate_server_cmaui:
-      - server_cmaui
-      - disk.write.requests.rate
       attachment_cmaui_port_8_test_nested4Level:
       - test_nested4Level
       - attachment_cmaui_port_8
+      disk.usage_server_cmaui_3:
+      - server_cmaui_3
+      - disk.usage
+      disk.device.write.bytes_server_cmaui_4_test_nested4Level:
+      - test_nested4Level
+      - disk.device.write.bytes_server_cmaui_4
       network.outgoing.bytes.rate_cmaui_port_8_test_nested4Level:
       - test_nested4Level
       - network.outgoing.bytes.rate_cmaui_port_8
-      disk.iops_server_cmaui_test_nested4Level:
-      - test_nested4Level
-      - disk.iops_server_cmaui
-      disk.device.read.requests_server_cmaui:
-      - server_cmaui
-      - disk.device.read.requests
       feature_cmaui_port_7_test_nested4Level:
       - test_nested4Level
       - feature_cmaui_port_7
-      endpoint_server_cmaui_test_nested4Level:
+      endpoint_server_cmaui_3:
+      - server_cmaui_3
+      - endpoint
+      memory_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - endpoint_server_cmaui
+      - memory_server_cmaui_4
       network.incoming.packets.rate_cmaui_port_6:
       - cmaui_port_6
       - network.incoming.packets.rate
-      memory_server_cmaui:
-      - server_cmaui
-      - memory
-      cpu.delta_server_cmaui_test_nested4Level:
-      - test_nested4Level
-      - cpu.delta_server_cmaui
-      memory.resident_server_cmaui_test_nested4Level:
+      os_server_cmaui_3:
+      - server_cmaui_3
+      - os
+      disk.root.size_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - memory.resident_server_cmaui
+      - disk.root.size_server_cmaui_4
       binding_cmaui_port_7_test_nested4Level:
       - test_nested4Level
       - binding_cmaui_port_7
-      binding_server_cmaui:
-      - server_cmaui
-      - binding
-      disk.device.read.requests.rate_server_cmaui:
-      - server_cmaui
-      - disk.device.read.requests.rate
-      disk.write.bytes_server_cmaui:
-      - server_cmaui
-      - disk.write.bytes
-      network.outgoing.bytes_cmaui_port_7_test_nested4Level:
+      disk.usage_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - network.outgoing.bytes_cmaui_port_7
-      disk.read.bytes_server_cmaui_test_nested4Level:
+      - disk.usage_server_cmaui_4
+      disk.device.latency_server_cmaui_4_test_nested4Level:
+      - test_nested4Level
+      - disk.device.latency_server_cmaui_4
+      disk.device.read.requests.rate_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.read.bytes_server_cmaui
-      disk.device.read.requests_server_cmaui_test_nested4Level:
+      - disk.device.read.requests.rate_server_cmaui_4
+      disk.ephemeral.size_server_cmaui_4_test_nested4Level:
+      - test_nested4Level
+      - disk.ephemeral.size_server_cmaui_4
+      disk.device.allocation_server_cmaui_3:
+      - server_cmaui_3
+      - disk.device.allocation
+      disk.read.bytes_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.device.read.requests_server_cmaui
-      disk.write.requests_server_cmaui_test_nested4Level:
+      - disk.read.bytes_server_cmaui_4
+      disk.allocation_server_cmaui_4_test_nested4Level:
+      - test_nested4Level
+      - disk.allocation_server_cmaui_4
+      network.outgoing.bytes_cmaui_port_7_test_nested4Level:
+      - test_nested4Level
+      - network.outgoing.bytes_cmaui_port_7
+      disk.device.allocation_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.write.requests_server_cmaui
-      disk.device.latency_server_cmaui_test_nested4Level:
+      - disk.device.allocation_server_cmaui_4
+      host_server_cmaui_3:
+      - server_cmaui_3
+      - host
+      disk.write.requests_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.device.latency_server_cmaui
+      - disk.write.requests_server_cmaui_4
       network.incoming.packets_cmaui_port_7_test_nested4Level:
       - test_nested4Level
       - network.incoming.packets_cmaui_port_7
       feature_test_nested4Level:
       - test_nested4Level
       - feature
-      os_server_cmaui_test_nested4Level:
-      - test_nested4Level
-      - os_server_cmaui
       network.incoming.bytes.rate_cmaui_port_6:
       - cmaui_port_6
       - network.incoming.bytes.rate
-      memory.resident_server_cmaui:
-      - server_cmaui
-      - memory.resident
+      instance_server_cmaui_3:
+      - server_cmaui_3
+      - instance
       network.incoming.packets.rate_cmaui_port_8_test_nested4Level:
       - test_nested4Level
       - network.incoming.packets.rate_cmaui_port_8
-      memory.usage_server_cmaui_test_nested4Level:
-      - test_nested4Level
-      - memory.usage_server_cmaui
       network.outpoing.packets_cmaui_port_5:
       - cmaui_port_5
       - network.outpoing.packets
-      disk.latency_server_cmaui:
-      - server_cmaui
-      - disk.latency
       network.outgoing.bytes_cmaui_port_6:
       - cmaui_port_6
       - network.outgoing.bytes
       network.outpoing.packets_cmaui_port_6:
       - cmaui_port_6
       - network.outpoing.packets
+      disk.read.bytes.rate_server_cmaui_3:
+      - server_cmaui_3
+      - disk.read.bytes.rate
       network.outgoing.bytes_cmaui_port_5:
       - cmaui_port_5
       - network.outgoing.bytes
-      vcpus_server_cmaui:
-      - server_cmaui
-      - vcpus
-      disk.device.write.bytes_server_cmaui:
-      - server_cmaui
-      - disk.device.write.bytes
-      disk.device.read.bytes_server_cmaui_test_nested4Level:
+      disk.device.usage_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.device.read.bytes_server_cmaui
-      cpu_util_server_cmaui_test_nested4Level:
+      - disk.device.usage_server_cmaui_4
+      disk.device.read.bytes.rate_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - cpu_util_server_cmaui
+      - disk.device.read.bytes.rate_server_cmaui_4
       network.incoming.bytes.rate_cmaui_port_5:
       - cmaui_port_5
       - network.incoming.bytes.rate
-      disk.allocation_server_cmaui:
-      - server_cmaui
-      - disk.allocation
-      disk.write.requests_server_cmaui:
-      - server_cmaui
-      - disk.write.requests
+      disk.device.read.requests_server_cmaui_3:
+      - server_cmaui_3
+      - disk.device.read.requests
       network.incoming.bytes_cmaui_port_7_test_nested4Level:
       - test_nested4Level
       - network.incoming.bytes_cmaui_port_7
-      endpoint_server_cmaui:
-      - server_cmaui
-      - endpoint
+      disk.device.read.requests.rate_server_cmaui_3:
+      - server_cmaui_3
+      - disk.device.read.requests.rate
+      cpu.delta_server_cmaui_3:
+      - server_cmaui_3
+      - cpu.delta
+      memory.resident_server_cmaui_3:
+      - server_cmaui_3
+      - memory.resident
+      disk.latency_server_cmaui_3:
+      - server_cmaui_3
+      - disk.latency
+      memory.usage_server_cmaui_3:
+      - server_cmaui_3
+      - memory.usage
     requirements:
       dependency_cmaui_port_7_test_nested4Level:
       - test_nested4Level
       - dependency_cmaui_port_7
+      local_storage_server_cmaui_4_test_nested4Level:
+      - test_nested4Level
+      - local_storage_server_cmaui_4
       dependency_cmaui_port_6:
       - cmaui_port_6
       - dependency
-      dependency_server_cmaui:
-      - server_cmaui
-      - dependency
       dependency_cmaui_port_8_test_nested4Level:
       - test_nested4Level
       - dependency_cmaui_port_8
-      local_storage_server_cmaui_test_nested4Level:
-      - test_nested4Level
-      - local_storage_server_cmaui
+      local_storage_server_cmaui_3:
+      - server_cmaui_3
+      - local_storage
       link_cmaui_port_6:
       - cmaui_port_6
       - link
@@ -564,15 +564,15 @@ topology_template:
       link_cmaui_port_8_test_nested4Level:
       - test_nested4Level
       - link_cmaui_port_8
-      local_storage_server_cmaui:
-      - server_cmaui
-      - local_storage
-      dependency_server_cmaui_test_nested4Level:
-      - test_nested4Level
-      - dependency_server_cmaui
       link_cmaui_port_7_test_nested4Level:
       - test_nested4Level
       - link_cmaui_port_7
+      dependency_server_cmaui_4_test_nested4Level:
+      - test_nested4Level
+      - dependency_server_cmaui_4
+      dependency_server_cmaui_3:
+      - server_cmaui_3
+      - dependency
       dependency_cmaui_port_5:
       - cmaui_port_5
       - 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/securityrulestoportconnection/sharedNestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/sharedNestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.yaml
index 720662bde6..c5b92cbd65 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/sharedNestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/sharedNestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.yaml
@@ -84,8 +84,21 @@ topology_template:
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
-          node: server_cmaui
+          node: server_cmaui_4
           relationship: tosca.relationships.network.BindsTo
+    server_cmaui_4:
+      type: org.openecomp.resource.vfc.nodes.heat.cmaui
+      properties:
+        flavor:
+          get_input: cmaui_flavor
+        availability_zone:
+          get_input: availability_zone_0
+        image:
+          get_input: cmaui_image
+        name:
+          get_input:
+          - cmaui_names
+          - 0
     cmaui_port_8:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
@@ -112,21 +125,8 @@ topology_template:
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
-          node: server_cmaui
+          node: server_cmaui_4
           relationship: tosca.relationships.network.BindsTo
-    server_cmaui:
-      type: org.openecomp.resource.vfc.nodes.heat.cmaui
-      properties:
-        flavor:
-          get_input: cmaui_flavor
-        availability_zone:
-          get_input: availability_zone_0
-        image:
-          get_input: cmaui_image
-        name:
-          get_input:
-          - cmaui_names
-          - 0
   groups:
     nested4_group:
       type: org.openecomp.groups.heat.HeatStack
@@ -135,119 +135,119 @@ topology_template:
         description: nested4
       members:
       - cmaui_port_7
+      - server_cmaui_4
       - cmaui_port_8
-      - server_cmaui
   substitution_mappings:
     node_type: org.openecomp.resource.abstract.nodes.heat.nested4
     capabilities:
-      cpu.delta_server_cmaui:
-      - server_cmaui
-      - cpu.delta
-      disk.device.write.requests.rate_server_cmaui:
-      - server_cmaui
-      - disk.device.write.requests.rate
-      disk.device.allocation_server_cmaui:
-      - server_cmaui
-      - disk.device.allocation
+      disk.write.bytes_server_cmaui_4:
+      - server_cmaui_4
+      - disk.write.bytes
+      disk.device.write.bytes_server_cmaui_4:
+      - server_cmaui_4
+      - disk.device.write.bytes
+      feature_server_cmaui_4:
+      - server_cmaui_4
+      - feature
+      disk.device.latency_server_cmaui_4:
+      - server_cmaui_4
+      - disk.device.latency
+      disk.device.usage_server_cmaui_4:
+      - server_cmaui_4
+      - disk.device.usage
       feature_cmaui_port_7:
       - cmaui_port_7
       - feature
       feature_cmaui_port_8:
       - cmaui_port_8
       - feature
-      scalable_server_cmaui:
-      - server_cmaui
-      - scalable
-      disk.read.bytes.rate_server_cmaui:
-      - server_cmaui
-      - disk.read.bytes.rate
-      cpu_server_cmaui:
-      - server_cmaui
-      - cpu
-      disk.write.bytes.rate_server_cmaui:
-      - server_cmaui
-      - disk.write.bytes.rate
-      disk.device.read.bytes.rate_server_cmaui:
-      - server_cmaui
-      - disk.device.read.bytes.rate
-      host_server_cmaui:
-      - server_cmaui
-      - host
-      cpu_util_server_cmaui:
-      - server_cmaui
-      - cpu_util
+      disk.read.requests_server_cmaui_4:
+      - server_cmaui_4
+      - disk.read.requests
+      disk.allocation_server_cmaui_4:
+      - server_cmaui_4
+      - disk.allocation
       network.outgoing.packets.rate_cmaui_port_8:
       - cmaui_port_8
       - network.outgoing.packets.rate
       attachment_cmaui_port_7:
       - cmaui_port_7
       - attachment
+      vcpus_server_cmaui_4:
+      - server_cmaui_4
+      - vcpus
+      binding_server_cmaui_4:
+      - server_cmaui_4
+      - binding
+      disk.root.size_server_cmaui_4:
+      - server_cmaui_4
+      - disk.root.size
+      disk.device.write.requests.rate_server_cmaui_4:
+      - server_cmaui_4
+      - disk.device.write.requests.rate
       attachment_cmaui_port_8:
       - cmaui_port_8
       - attachment
+      scalable_server_cmaui_4:
+      - server_cmaui_4
+      - scalable
       network.outgoing.packets.rate_cmaui_port_7:
       - cmaui_port_7
       - network.outgoing.packets.rate
-      disk.device.latency_server_cmaui:
-      - server_cmaui
-      - disk.device.latency
-      disk.device.write.requests_server_cmaui:
-      - server_cmaui
-      - disk.device.write.requests
-      disk.read.requests_server_cmaui:
-      - server_cmaui
-      - disk.read.requests
-      disk.device.capacity_server_cmaui:
-      - server_cmaui
-      - disk.device.capacity
-      disk.usage_server_cmaui:
-      - server_cmaui
+      disk.write.requests_server_cmaui_4:
+      - server_cmaui_4
+      - disk.write.requests
+      disk.usage_server_cmaui_4:
+      - server_cmaui_4
       - disk.usage
-      disk.device.usage_server_cmaui:
-      - server_cmaui
-      - disk.device.usage
-      disk.capacity_server_cmaui:
-      - server_cmaui
-      - disk.capacity
-      disk.write.requests.rate_server_cmaui:
-      - server_cmaui
-      - disk.write.requests.rate
-      disk.device.read.requests_server_cmaui:
-      - server_cmaui
-      - disk.device.read.requests
-      instance_server_cmaui:
-      - server_cmaui
-      - instance
-      disk.device.read.bytes_server_cmaui:
-      - server_cmaui
-      - disk.device.read.bytes
+      disk.device.capacity_server_cmaui_4:
+      - server_cmaui_4
+      - disk.device.capacity
+      disk.device.iops_server_cmaui_4:
+      - server_cmaui_4
+      - disk.device.iops
+      disk.device.read.bytes.rate_server_cmaui_4:
+      - server_cmaui_4
+      - disk.device.read.bytes.rate
+      endpoint_server_cmaui_4:
+      - server_cmaui_4
+      - endpoint
+      disk.read.bytes_server_cmaui_4:
+      - server_cmaui_4
+      - disk.read.bytes
       network.incoming.packets.rate_cmaui_port_7:
       - cmaui_port_7
       - network.incoming.packets.rate
-      memory_server_cmaui:
-      - server_cmaui
-      - memory
+      os_server_cmaui_4:
+      - server_cmaui_4
+      - os
       network.incoming.packets.rate_cmaui_port_8:
       - cmaui_port_8
       - network.incoming.packets.rate
-      disk.root.size_server_cmaui:
-      - server_cmaui
-      - disk.root.size
-      binding_server_cmaui:
-      - server_cmaui
-      - binding
-      disk.device.read.requests.rate_server_cmaui:
-      - server_cmaui
-      - disk.device.read.requests.rate
-      disk.write.bytes_server_cmaui:
-      - server_cmaui
-      - disk.write.bytes
-      os_server_cmaui:
-      - server_cmaui
-      - os
-      disk.device.write.bytes.rate_server_cmaui:
-      - server_cmaui
-      - disk.device.write.bytes.rate
+      disk.device.allocation_server_cmaui_4:
+      - server_cmaui_4
+      - disk.device.allocation
+      disk.write.requests.rate_server_cmaui_4:
+      - server_cmaui_4
+      - disk.write.requests.rate
+      disk.device.read.bytes_server_cmaui_4:
+      - server_cmaui_4
+      - disk.device.read.bytes
+      memory_server_cmaui_4:
+      - server_cmaui_4
+      - memory
+      disk.write.bytes.rate_server_cmaui_4:
+      - server_cmaui_4
+      - disk.write.bytes.rate
+      cpu_server_cmaui_4:
+      - server_cmaui_4
+      - cpu
+      disk.capacity_server_cmaui_4:
+      - server_cmaui_4
+      - disk.capacity
+      host_server_cmaui_4:
+      - server_cmaui_4
+      - host
       network.incoming.packets_cmaui_port_7:
       - cmaui_port_7
       - network.incoming.packets
@@ -257,53 +257,53 @@ topology_template:
       network.incoming.bytes.rate_cmaui_port_7:
       - cmaui_port_7
       - network.incoming.bytes.rate
+      instance_server_cmaui_4:
+      - server_cmaui_4
+      - instance
       network.incoming.bytes.rate_cmaui_port_8:
       - cmaui_port_8
       - network.incoming.bytes.rate
-      memory.resident_server_cmaui:
-      - server_cmaui
-      - memory.resident
       network.outgoing.bytes_cmaui_port_7:
       - cmaui_port_7
       - network.outgoing.bytes
-      disk.latency_server_cmaui:
-      - server_cmaui
-      - disk.latency
-      feature_server_cmaui:
-      - server_cmaui
-      - feature
       network.outpoing.packets_cmaui_port_7:
       - cmaui_port_7
       - network.outpoing.packets
-      vcpus_server_cmaui:
-      - server_cmaui
-      - vcpus
+      disk.read.bytes.rate_server_cmaui_4:
+      - server_cmaui_4
+      - disk.read.bytes.rate
       network.outpoing.packets_cmaui_port_8:
       - cmaui_port_8
       - network.outpoing.packets
-      disk.device.write.bytes_server_cmaui:
-      - server_cmaui
-      - disk.device.write.bytes
+      disk.device.write.requests_server_cmaui_4:
+      - server_cmaui_4
+      - disk.device.write.requests
       binding_cmaui_port_7:
       - cmaui_port_7
       - binding
       network.outgoing.bytes_cmaui_port_8:
       - cmaui_port_8
       - network.outgoing.bytes
+      disk.device.read.requests_server_cmaui_4:
+      - server_cmaui_4
+      - disk.device.read.requests
       binding_cmaui_port_8:
       - cmaui_port_8
       - binding
-      disk.allocation_server_cmaui:
-      - server_cmaui
-      - disk.allocation
-      disk.write.requests_server_cmaui:
-      - server_cmaui
-      - disk.write.requests
-      memory.usage_server_cmaui:
-      - server_cmaui
-      - memory.usage
-      disk.ephemeral.size_server_cmaui:
-      - server_cmaui
+      disk.iops_server_cmaui_4:
+      - server_cmaui_4
+      - disk.iops
+      disk.device.read.requests.rate_server_cmaui_4:
+      - server_cmaui_4
+      - disk.device.read.requests.rate
+      cpu.delta_server_cmaui_4:
+      - server_cmaui_4
+      - cpu.delta
+      memory.resident_server_cmaui_4:
+      - server_cmaui_4
+      - memory.resident
+      disk.ephemeral.size_server_cmaui_4:
+      - server_cmaui_4
       - disk.ephemeral.size
       network.outgoing.bytes.rate_cmaui_port_7:
       - cmaui_port_7
@@ -311,24 +311,24 @@ topology_template:
       network.incoming.bytes_cmaui_port_8:
       - cmaui_port_8
       - network.incoming.bytes
-      endpoint_server_cmaui:
-      - server_cmaui
-      - endpoint
       network.incoming.bytes_cmaui_port_7:
       - cmaui_port_7
       - network.incoming.bytes
-      disk.iops_server_cmaui:
-      - server_cmaui
-      - disk.iops
+      disk.latency_server_cmaui_4:
+      - server_cmaui_4
+      - disk.latency
       network.outgoing.bytes.rate_cmaui_port_8:
       - cmaui_port_8
       - network.outgoing.bytes.rate
-      disk.device.iops_server_cmaui:
-      - server_cmaui
-      - disk.device.iops
-      disk.read.bytes_server_cmaui:
-      - server_cmaui
-      - disk.read.bytes
+      disk.device.write.bytes.rate_server_cmaui_4:
+      - server_cmaui_4
+      - disk.device.write.bytes.rate
+      memory.usage_server_cmaui_4:
+      - server_cmaui_4
+      - memory.usage
+      cpu_util_server_cmaui_4:
+      - server_cmaui_4
+      - cpu_util
     requirements:
       dependency_cmaui_port_8:
       - cmaui_port_8
@@ -342,9 +342,9 @@ topology_template:
       link_cmaui_port_7:
       - cmaui_port_7
       - link
-      dependency_server_cmaui:
-      - server_cmaui
+      dependency_server_cmaui_4:
+      - server_cmaui_4
       - dependency
-      local_storage_server_cmaui:
-      - server_cmaui
+      local_storage_server_cmaui_4:
+      - server_cmaui_4
       - local_storage
\ 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/securityrulestoportconnection/sharedNestedMultiLevels/inputfiles/nested1.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/sharedNestedMultiLevels/inputfiles/nested1.yml
index c73fcf63d7..d59f16ed06 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/sharedNestedMultiLevels/inputfiles/nested1.yml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/sharedNestedMultiLevels/inputfiles/nested1.yml
@@ -47,7 +47,7 @@ resources:
       security_groups: [{get_param: p2}]
       replacement_policy: AUTO
 
-  server_cmaui:
+  server_cmaui_1:
     type: OS::Nova::Server
     properties:
       name: { get_param: [cmaui_names, 0]}
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/sharedNestedMultiLevels/inputfiles/nested2.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/sharedNestedMultiLevels/inputfiles/nested2.yml
index b4655fa35d..dca4585db3 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/sharedNestedMultiLevels/inputfiles/nested2.yml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/sharedNestedMultiLevels/inputfiles/nested2.yml
@@ -47,7 +47,7 @@ resources:
       security_groups: [{get_param: p1}]
       replacement_policy: AUTO
 
-  server_cmaui:
+  server_cmaui_2:
     type: OS::Nova::Server
     properties:
       name: { get_param: [cmaui_names, 0]}
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/sharedNestedMultiLevels/inputfiles/nested3.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/sharedNestedMultiLevels/inputfiles/nested3.yml
index 55538833a4..157b085924 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/sharedNestedMultiLevels/inputfiles/nested3.yml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/sharedNestedMultiLevels/inputfiles/nested3.yml
@@ -48,7 +48,7 @@ resources:
       security_groups: [{get_param: p2}]
       replacement_policy: AUTO
 
-  server_cmaui:
+  server_cmaui_3:
     type: OS::Nova::Server
     properties:
       name: { get_param: [cmaui_names, 0]}
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/sharedNestedMultiLevels/inputfiles/nested4.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/sharedNestedMultiLevels/inputfiles/nested4.yml
index ce3ffb76a8..0e689efa6a 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/sharedNestedMultiLevels/inputfiles/nested4.yml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/sharedNestedMultiLevels/inputfiles/nested4.yml
@@ -46,7 +46,7 @@ resources:
       security_groups: [{get_param: p2},{get_param: p2}]
       replacement_policy: AUTO
 
-  server_cmaui:
+  server_cmaui_4:
     type: OS::Nova::Server
     properties:
       name: { get_param: [cmaui_names, 0]}