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>

5 files changed, 1940 insertions, 1940 deletions

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/sharedNestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/sharedNestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
index e12c89613e..5be719ef1a 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/sharedNestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/sharedNestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -90,46 +90,60 @@ node_types:
         occurrences:
         - 1
         - 1
-    - dependency_template_VMInt_OAM_lb_3:
+    - dependency_server_cmaui:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_template_VMInt_OAM_lb_3:
+    - local_storage_server_cmaui:
+        capability: tosca.capabilities.Attachment
+        node: tosca.nodes.BlockStorage
+        relationship: tosca.relationships.AttachesTo
+        occurrences:
+        - 0
+        - UNBOUNDED
+    - dependency_template_VMInt_OAM_lb_30:
+        capability: tosca.capabilities.Node
+        node: tosca.nodes.Root
+        relationship: tosca.relationships.DependsOn
+        occurrences:
+        - 0
+        - UNBOUNDED
+    - link_template_VMInt_OAM_lb_30:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
         - 1
         - 1
-    - binding_template_VMInt_OAM_lb_3:
+    - binding_template_VMInt_OAM_lb_30:
         capability: tosca.capabilities.network.Bindable
         relationship: tosca.relationships.network.BindsTo
         occurrences:
         - 1
         - 1
-    - dependency_server_cmaui:
+    - dependency_test_nested2Level:
         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
-    - dependency_test_nested2Level:
+    - 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_test_nested3Level_test_nested2Level:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
@@ -183,14 +197,14 @@ node_types:
         occurrences:
         - 1
         - 1
-    - dependency_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+    - 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_test_nested4Level_test_nested3Level_test_nested2Level:
+    - local_storage_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         capability: tosca.capabilities.Attachment
         node: tosca.nodes.BlockStorage
         relationship: tosca.relationships.AttachesTo
@@ -210,14 +224,14 @@ node_types:
         occurrences:
         - 1
         - 1
-    - dependency_server_cmaui_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_nested3Level_test_nested2Level:
+    - local_storage_server_cmaui_3_test_nested3Level_test_nested2Level:
         capability: tosca.capabilities.Attachment
         node: tosca.nodes.BlockStorage
         relationship: tosca.relationships.AttachesTo
@@ -250,26 +264,7 @@ node_types:
         occurrences:
         - 1
         - 1
-    - 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
     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.
@@ -282,7 +277,7 @@ node_types:
         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:
@@ -294,19 +289,13 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_template_VMInt_OAM_lb_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
-      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:
+      network.outpoing.packets_template_VMInt_OAM_lb_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:
@@ -319,48 +308,30 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.latency_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      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
-      binding_template_VMInt_OAM_lb_5_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.write.requests_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
-      feature_server_cmaui_test_nested2Level:
-        type: tosca.capabilities.Node
+      scalable_server_cmaui_3_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
-      binding_template_VMInt_OAM_lb_3:
+      binding_template_VMInt_OAM_lb_5_test_nested3Level_test_nested2Level:
         type: tosca.capabilities.network.Bindable
         valid_source_types:
         - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
         occurrences:
         - 0
         - UNBOUNDED
-      network.incoming.bytes_template_VMInt_OAM_lb_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_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.Endpoint.Admin
-        occurrences:
-        - 1
-        - UNBOUNDED
       network.incoming.bytes_template_VMInt_OAM_lb_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -373,48 +344,46 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      network.incoming.packets_template_VMInt_OAM_lb_30:
         type: org.openecomp.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_template_VMInt_OAM_lb_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.
+      endpoint_server_cmaui_2_test_nested2Level:
+        type: tosca.capabilities.Endpoint.Admin
         occurrences:
         - 1
         - UNBOUNDED
-      instance_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      network.outgoing.bytes.rate_template_VMInt_OAM_lb_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
-      feature_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.Node
+      binding_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
         - UNBOUNDED
-      disk.root.size_server_cmaui_test_nested2Level:
+      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
-      disk.write.requests_server_cmaui_test_nested3Level_test_nested2Level:
+      network.incoming.packets.rate_template_VMInt_OAM_lb_30:
         type: org.openecomp.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_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.
+      feature_server_cmaui_2_test_nested2Level:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.usage_server_cmaui_test_nested4Level_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:
@@ -439,13 +408,13 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_template_VMInt_OAM_lb_5_test_nested3Level_test_nested2Level:
+      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:
         - 1
         - UNBOUNDED
-      cpu.delta_server_cmaui_test_nested3Level_test_nested2Level:
+      network.outgoing.packets.rate_template_VMInt_OAM_lb_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:
@@ -458,105 +427,96 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-      network.outpoing.packets_template_VMInt_OAM_lb_4_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
-      cpu_server_cmaui_test_nested2Level:
+      network.outpoing.packets_template_VMInt_OAM_lb_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
-      os_server_cmaui:
-        type: tosca.capabilities.OperatingSystem
-        occurrences:
-        - 1
-        - UNBOUNDED
-      memory.resident_server_cmaui_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:
         - 1
         - UNBOUNDED
-      os_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.OperatingSystem
+      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.read.requests.rate_server_cmaui_test_nested3Level_test_nested2Level:
+      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.write.bytes_server_cmaui_test_nested2Level:
+      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:
         - 1
         - UNBOUNDED
-      scalable_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.Scalable
+      os_server_cmaui:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      instance_server_cmaui_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:
         - 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.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
-      network.incoming.packets_template_VMInt_OAM_lb_1:
+      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
-      network.incoming.packets_template_VMInt_OAM_lb_2:
+      network.incoming.bytes.rate_template_VMInt_OAM_lb_30:
         type: org.openecomp.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_template_VMInt_OAM_lb_3:
+      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:
         - 1
         - UNBOUNDED
-      network.incoming.packets_template_VMInt_OAM_lb_3:
+      network.incoming.packets_template_VMInt_OAM_lb_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_template_VMInt_OAM_lb_8_test_nested4Level_test_nested3Level_test_nested2Level:
+      network.incoming.packets_template_VMInt_OAM_lb_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_template_VMInt_OAM_lb_1:
+      network.outgoing.bytes_template_VMInt_OAM_lb_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.allocation_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      network.outgoing.bytes_template_VMInt_OAM_lb_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:
@@ -575,19 +535,19 @@ node_types:
         occurrences:
         - 0
         - 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:
@@ -598,70 +558,66 @@ node_types:
         occurrences:
         - 1
         - 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
-      network.outgoing.packets.rate_template_VMInt_OAM_lb_4_test_nested2Level:
+      memory.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.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.ephemeral.size_server_cmaui:
+      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
-      os_server_cmaui_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.OperatingSystem
+      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
-      network.incoming.bytes.rate_template_VMInt_OAM_lb_8_test_nested4Level_test_nested3Level_test_nested2Level:
+      network.outgoing.packets.rate_template_VMInt_OAM_lb_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
-      cpu_util_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.ephemeral.size_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_server_cmaui_test_nested3Level_test_nested2Level:
+      network.incoming.bytes.rate_template_VMInt_OAM_lb_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_template_VMInt_OAM_lb_3_test_nested2Level:
+      network.outpoing.packets_template_VMInt_OAM_lb_30:
         type: org.openecomp.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_template_VMInt_OAM_lb_6_test_nested3Level_test_nested2Level:
+      network.incoming.packets_template_VMInt_OAM_lb_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
-      disk.device.read.requests_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      network.outgoing.packets.rate_template_VMInt_OAM_lb_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:
@@ -673,19 +629,19 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.iops_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      network.incoming.bytes.rate_template_VMInt_OAM_lb_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.rate_template_VMInt_OAM_lb_5_test_nested3Level_test_nested2Level:
+      network.incoming.bytes.rate_template_VMInt_OAM_lb_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.bytes.rate_template_VMInt_OAM_lb_6_test_nested3Level_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:
@@ -698,13 +654,13 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-      disk.device.read.requests_server_cmaui_test_nested2Level:
+      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
-      cpu_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:
@@ -721,13 +677,19 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      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.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.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests.rate_server_cmaui_test_nested2Level:
+      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:
@@ -738,6 +700,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      os_server_cmaui_3_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.OperatingSystem
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.incoming.bytes_template_VMInt_OAM_lb_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.
@@ -750,7 +717,13 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.latency_server_cmaui_test_nested2Level:
+      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
+      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:
@@ -774,6 +747,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      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.outgoing.bytes.rate_template_VMInt_OAM_lb_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -798,6 +777,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      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.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.
@@ -810,7 +795,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_template_VMInt_OAM_lb_3:
+      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:
@@ -828,7 +813,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes.rate_server_cmaui_test_nested2Level:
+      network.incoming.bytes_template_VMInt_OAM_lb_30:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -846,45 +831,39 @@ node_types:
         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.
-        occurrences:
-        - 1
-        - UNBOUNDED
       feature_template_VMInt_OAM_lb_2:
         type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      feature_template_VMInt_OAM_lb_3:
+      feature_template_VMInt_OAM_lb_1:
         type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.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.
+      os_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      feature_template_VMInt_OAM_lb_1:
-        type: tosca.capabilities.Node
+      binding_server_cmaui:
+        type: tosca.capabilities.network.Bindable
         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
+      network.incoming.packets.rate_template_VMInt_OAM_lb_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_template_VMInt_OAM_lb_8_test_nested4Level_test_nested3Level_test_nested2Level:
+      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:
@@ -896,13 +875,13 @@ node_types:
         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
-      disk.device.capacity_server_cmaui_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:
@@ -920,30 +899,24 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      endpoint_server_cmaui_test_nested2Level:
-        type: tosca.capabilities.Endpoint.Admin
-        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
-      network.outpoing.packets_template_VMInt_OAM_lb_7_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
-      disk.read.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.
+      os_server_cmaui_2_test_nested2Level:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_template_VMInt_OAM_lb_3:
+      network.outpoing.packets_template_VMInt_OAM_lb_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:
@@ -955,151 +928,139 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_server_cmaui_test_nested3Level_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
-      disk.device.read.bytes.rate_server_cmaui_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.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
-      memory.usage_server_cmaui_test_nested3Level_test_nested2Level:
+      network.outgoing.packets.rate_template_VMInt_OAM_lb_30:
         type: org.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
-        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.outgoing.bytes.rate_template_VMInt_OAM_lb_30:
         type: org.openecomp.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_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
-      instance_server_cmaui_test_nested3Level_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
-      memory_server_cmaui_test_nested2Level:
+      vcpus_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.allocation_server_cmaui:
+      disk.device.write.bytes_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_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
-      disk.ephemeral.size_server_cmaui_test_nested2Level:
+      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.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes_server_cmaui_test_nested3Level_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
-      disk.device.allocation_server_cmaui_test_nested2Level:
+      network.outgoing.bytes.rate_template_VMInt_OAM_lb_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
-      disk.device.iops_server_cmaui_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
-      network.outgoing.bytes.rate_template_VMInt_OAM_lb_6_test_nested3Level_test_nested2Level:
+      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:
         - 1
         - UNBOUNDED
-      binding_server_cmaui_test_nested2Level:
-        type: tosca.capabilities.network.Bindable
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.device.write.bytes_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      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
-      memory.usage_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      network.outgoing.packets.rate_template_VMInt_OAM_lb_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
-      cpu.delta_server_cmaui:
+      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:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_template_VMInt_OAM_lb_8_test_nested4Level_test_nested3Level_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
-      disk.device.capacity_server_cmaui_test_nested2Level:
+      network.incoming.packets_template_VMInt_OAM_lb_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.packets_template_VMInt_OAM_lb_7_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
-      disk.write.requests_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_server_cmaui_3_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
@@ -1114,50 +1075,44 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.usage_server_cmaui_test_nested4Level_test_nested3Level_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
-      scalable_server_cmaui_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.Scalable
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.read.bytes_server_cmaui_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
-      disk.device.latency_server_cmaui_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:
         - 1
         - UNBOUNDED
-      cpu.delta_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      cpu_util_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.usage_server_cmaui_test_nested3Level_test_nested2Level:
+      network.incoming.bytes_template_VMInt_OAM_lb_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
-      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
-      network.incoming.bytes_template_VMInt_OAM_lb_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.
+      feature_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
@@ -1167,91 +1122,90 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests_server_cmaui:
+      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.write.requests.rate_server_cmaui_test_nested3Level_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
-      network.incoming.packets_template_VMInt_OAM_lb_8_test_nested4Level_test_nested3Level_test_nested2Level:
+      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.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.capacity_server_cmaui_test_nested2Level:
+      network.incoming.packets_template_VMInt_OAM_lb_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.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
-      disk.device.usage_server_cmaui_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.read.requests_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.
+      feature_template_VMInt_OAM_lb_30:
+        type: tosca.capabilities.Node
         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.outgoing.packets.rate_template_VMInt_OAM_lb_2:
+      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:
+      disk.device.read.bytes_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
-      network.outgoing.packets.rate_template_VMInt_OAM_lb_1:
+      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.root.size_server_cmaui:
+      network.outgoing.packets.rate_template_VMInt_OAM_lb_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_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
-      disk.device.write.requests.rate_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      network.outgoing.packets.rate_template_VMInt_OAM_lb_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_nested4Level_test_nested3Level_test_nested2Level:
+      disk.root.size_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:
@@ -1263,37 +1217,37 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.capacity_server_cmaui_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.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
-      disk.device.write.bytes.rate_server_cmaui:
+      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.read.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      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
-      network.outpoing.packets_template_VMInt_OAM_lb_1:
+      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.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_template_VMInt_OAM_lb_3:
+      network.outpoing.packets_template_VMInt_OAM_lb_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:
@@ -1305,46 +1259,38 @@ 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
-      disk.write.requests.rate_server_cmaui_test_nested4Level_test_nested3Level_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.device.write.bytes_server_cmaui_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
-      host_server_cmaui_test_nested2Level:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
-        occurrences:
-        - 1
-        - UNBOUNDED
-      memory_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
@@ -1354,25 +1300,25 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_template_VMInt_OAM_lb_3_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_template_VMInt_OAM_lb_5_test_nested3Level_test_nested2Level:
+      network.incoming.bytes.rate_template_VMInt_OAM_lb_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
-      disk.device.read.bytes.rate_server_cmaui_test_nested3Level_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
-      network.outgoing.bytes.rate_template_VMInt_OAM_lb_3:
+      network.incoming.packets_template_VMInt_OAM_lb_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:
@@ -1389,63 +1335,51 @@ node_types:
         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.
-        occurrences:
-        - 1
-        - UNBOUNDED
       network.incoming.bytes.rate_template_VMInt_OAM_lb_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests_server_cmaui_test_nested3Level_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:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_template_VMInt_OAM_lb_3:
+      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
-      vcpus_server_cmaui_test_nested2Level:
+      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.device.write.bytes.rate_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.iops_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_template_VMInt_OAM_lb_30:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
         occurrences:
-        - 1
+        - 0
         - UNBOUNDED
-      memory.usage_server_cmaui_test_nested2Level:
+      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.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.iops_server_cmaui:
+      disk.read.bytes_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.read.bytes_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_test_nested2Level:
+        type: tosca.capabilities.Endpoint.Admin
         occurrences:
         - 1
         - UNBOUNDED
@@ -1466,9 +1400,8 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.requests_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_3_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
         - UNBOUNDED
@@ -1478,24 +1411,19 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_template_VMInt_OAM_lb_3_test_nested2Level:
+      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
-      feature_server_cmaui_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      memory_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      network.outgoing.bytes_template_VMInt_OAM_lb_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
-      cpu_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      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:
@@ -1512,49 +1440,49 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.iops_server_cmaui_test_nested3Level_test_nested2Level:
+      network.incoming.bytes_template_VMInt_OAM_lb_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_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
-      network.incoming.bytes_template_VMInt_OAM_lb_4_test_nested2Level:
+      network.outgoing.bytes_template_VMInt_OAM_lb_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_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_template_VMInt_OAM_lb_4_test_nested2Level:
+      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.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.capacity_server_cmaui:
+      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
-      disk.device.write.bytes_server_cmaui_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
-      disk.device.read.requests_server_cmaui_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:
@@ -1565,13 +1493,19 @@ 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.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_test_nested4Level_test_nested3Level_test_nested2Level:
+      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:
@@ -1583,12 +1517,13 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      scalable_server_cmaui_test_nested2Level:
-        type: tosca.capabilities.Scalable
+      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.usage_server_cmaui_test_nested2Level:
+      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:
@@ -1600,53 +1535,69 @@ 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
-      network.outgoing.bytes.rate_template_VMInt_OAM_lb_3_test_nested2Level:
+      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
-      network.outpoing.packets_template_VMInt_OAM_lb_8_test_nested4Level_test_nested3Level_test_nested2Level:
+      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.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
+      network.outgoing.bytes.rate_template_VMInt_OAM_lb_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
-      disk.write.bytes_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      network.outpoing.packets_template_VMInt_OAM_lb_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
-      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:
         - 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
+      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
       network.incoming.packets_template_VMInt_OAM_lb_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
-      host_server_cmaui_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
+      binding_server_cmaui_2_test_nested2Level:
+        type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
         - UNBOUNDED
@@ -1656,6 +1607,18 @@ node_types:
         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
+      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
       network.outgoing.bytes_template_VMInt_OAM_lb_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.
@@ -1668,49 +1631,67 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests_server_cmaui_test_nested2Level:
+      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
-      memory.resident_server_cmaui:
+      network.outgoing.bytes_template_VMInt_OAM_lb_30:
         type: org.openecomp.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
-      network.outgoing.packets.rate_template_VMInt_OAM_lb_3_test_nested2Level:
+      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.latency_server_cmaui:
+      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.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_template_VMInt_OAM_lb_5_test_nested3Level_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
+      network.outgoing.packets.rate_template_VMInt_OAM_lb_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
-      disk.allocation_server_cmaui_test_nested2Level:
+      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
-      disk.allocation_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      network.incoming.packets.rate_template_VMInt_OAM_lb_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:
@@ -1730,13 +1711,25 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
+      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
       disk.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.
         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:
@@ -1747,7 +1740,13 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      memory.resident_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      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.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:
@@ -1770,21 +1769,22 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_template_VMInt_OAM_lb_6_test_nested3Level_test_nested2Level:
+      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:
+      network.outgoing.bytes_template_VMInt_OAM_lb_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
-      disk.allocation_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.
+      host_server_cmaui_2_test_nested2Level:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
@@ -1847,6 +1847,20 @@ node_types:
         required: true
         status: SUPPORTED
     requirements:
+    - 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_test_nested3Level:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
@@ -1900,14 +1914,14 @@ node_types:
         occurrences:
         - 1
         - 1
-    - dependency_server_cmaui_test_nested4Level_test_nested3Level:
+    - 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_test_nested4Level_test_nested3Level:
+    - local_storage_server_cmaui_4_test_nested4Level_test_nested3Level:
         capability: tosca.capabilities.Attachment
         node: tosca.nodes.BlockStorage
         relationship: tosca.relationships.AttachesTo
@@ -1927,14 +1941,14 @@ node_types:
         occurrences:
         - 1
         - 1
-    - dependency_server_cmaui_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_nested3Level:
+    - local_storage_server_cmaui_3_test_nested3Level:
         capability: tosca.capabilities.Attachment
         node: tosca.nodes.BlockStorage
         relationship: tosca.relationships.AttachesTo
@@ -1967,20 +1981,6 @@ 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
-        occurrences:
-        - 0
-        - UNBOUNDED
     capabilities:
       network.incoming.bytes.rate_template_VMInt_OAM_lb_8_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
@@ -1988,31 +1988,19 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      cpu.delta_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.device.write.requests.rate_server_cmaui:
+      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
-      disk.write.bytes.rate_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
-      vcpus_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
-      disk.device.allocation_server_cmaui:
+      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:
@@ -2023,24 +2011,13 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.latency_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
-      disk.device.capacity_server_cmaui_test_nested4Level_test_nested3Level:
+      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
-      scalable_server_cmaui:
-        type: tosca.capabilities.Scalable
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.read.bytes.rate_server_cmaui:
+      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:
@@ -2052,49 +2029,37 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      memory.resident_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
-      disk.capacity_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
-      host_server_cmaui:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
-        occurrences:
-        - 1
-        - UNBOUNDED
-      cpu_util_server_cmaui:
+      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
-      os_server_cmaui_test_nested3Level:
-        type: tosca.capabilities.OperatingSystem
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.device.read.bytes_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
-      disk.device.read.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level:
+      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
-      memory.usage_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:
@@ -2107,6 +2072,12 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
+      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
       binding_template_VMInt_OAM_lb_3:
         type: tosca.capabilities.network.Bindable
         valid_source_types:
@@ -2114,13 +2085,18 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
+      endpoint_server_cmaui_4_test_nested4Level_test_nested3Level:
+        type: tosca.capabilities.Endpoint.Admin
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.incoming.bytes_template_VMInt_OAM_lb_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.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:
@@ -2132,19 +2108,19 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_template_VMInt_OAM_lb_7_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
-      instance_server_cmaui_test_nested4Level_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:
         - 1
         - UNBOUNDED
-      disk.device.capacity_server_cmaui_test_nested3Level:
+      network.outgoing.bytes_template_VMInt_OAM_lb_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:
@@ -2155,30 +2131,50 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes_server_cmaui_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
-      disk.device.write.bytes.rate_server_cmaui_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
+      network.outgoing.bytes.rate_template_VMInt_OAM_lb_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.outgoing.bytes.rate_template_VMInt_OAM_lb_6_test_nested3Level:
+      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
+      host_server_cmaui_4_test_nested4Level_test_nested3Level:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
+        occurrences:
+        - 1
+        - UNBOUNDED
+      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.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
-      memory.usage_server_cmaui_test_nested3Level:
+      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:
@@ -2189,71 +2185,80 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      instance_server_cmaui:
+      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
-      disk.device.read.bytes_server_cmaui:
+      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
-      binding_server_cmaui_test_nested3Level:
-        type: tosca.capabilities.network.Bindable
+      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
-      disk.root.size_server_cmaui:
+      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
-      memory_server_cmaui_test_nested3Level:
+      network.incoming.bytes.rate_template_VMInt_OAM_lb_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.bytes.rate_template_VMInt_OAM_lb_5_test_nested3Level:
+      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
-      os_server_cmaui:
-        type: tosca.capabilities.OperatingSystem
+      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
-      disk.device.write.bytes.rate_server_cmaui:
+      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
-      disk.device.latency_server_cmaui_test_nested4Level_test_nested3Level:
+      host_server_cmaui_3_test_nested3Level:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
+        occurrences:
+        - 1
+        - UNBOUNDED
+      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
-      network.outpoing.packets_template_VMInt_OAM_lb_3:
+      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.incoming.packets_template_VMInt_OAM_lb_5_test_nested3Level:
+      network.outpoing.packets_template_VMInt_OAM_lb_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.ephemeral.size_server_cmaui_test_nested3Level:
+      network.incoming.packets_template_VMInt_OAM_lb_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:
@@ -2271,31 +2276,37 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests.rate_server_cmaui_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
-      vcpus_server_cmaui_test_nested4Level_test_nested3Level:
+      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_template_VMInt_OAM_lb_3:
+      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
-      network.incoming.packets_template_VMInt_OAM_lb_3:
+      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
-      cpu_util_server_cmaui_test_nested3Level:
+      network.outgoing.bytes_template_VMInt_OAM_lb_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_template_VMInt_OAM_lb_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:
@@ -2320,202 +2331,203 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-      endpoint_server_cmaui_test_nested4Level_test_nested3Level:
-        type: tosca.capabilities.Endpoint.Admin
+      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.allocation_server_cmaui_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
-      memory.resident_server_cmaui_test_nested3Level:
+      network.outgoing.bytes_template_VMInt_OAM_lb_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.ephemeral.size_server_cmaui_test_nested4Level_test_nested3Level:
+      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
-      cpu.delta_server_cmaui_test_nested3Level:
+      network.outgoing.bytes.rate_template_VMInt_OAM_lb_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_server_cmaui_test_nested3Level:
+      network.outgoing.bytes.rate_template_VMInt_OAM_lb_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.read.requests_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:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_template_VMInt_OAM_lb_8_test_nested4Level_test_nested3Level:
+      network.incoming.bytes.rate_template_VMInt_OAM_lb_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_test_nested4Level_test_nested3Level:
+      network.incoming.bytes.rate_template_VMInt_OAM_lb_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
-      feature_server_cmaui:
-        type: tosca.capabilities.Node
+      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:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_template_VMInt_OAM_lb_3:
+      network.incoming.bytes_template_VMInt_OAM_lb_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.rate_server_cmaui_test_nested3Level:
+      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:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_template_VMInt_OAM_lb_4:
-        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_3_test_nested3Level:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests_server_cmaui_test_nested4Level_test_nested3Level:
+      network.incoming.packets.rate_template_VMInt_OAM_lb_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
-      endpoint_server_cmaui_test_nested3Level:
-        type: tosca.capabilities.Endpoint.Admin
+      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
-      network.incoming.bytes.rate_template_VMInt_OAM_lb_3:
+      network.incoming.packets.rate_template_VMInt_OAM_lb_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.requests_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:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_template_VMInt_OAM_lb_4:
+      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
-      memory.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.
+      os_server_cmaui_4_test_nested4Level_test_nested3Level:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_template_VMInt_OAM_lb_8_test_nested4Level_test_nested3Level:
+      network.outpoing.packets_template_VMInt_OAM_lb_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.ephemeral.size_server_cmaui:
+      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
-      memory_server_cmaui_test_nested4Level_test_nested3Level:
+      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
-      network.incoming.packets.rate_template_VMInt_OAM_lb_7_test_nested4Level_test_nested3Level:
+      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.device.usage_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.incoming.packets.rate_template_VMInt_OAM_lb_6_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_template_VMInt_OAM_lb_5_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
-      disk.iops_server_cmaui:
+      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
-      disk.iops_server_cmaui_test_nested4Level_test_nested3Level:
+      network.outgoing.bytes.rate_template_VMInt_OAM_lb_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.iops_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
-      disk.read.bytes_server_cmaui:
+      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
-      disk.root.size_server_cmaui_test_nested3Level:
+      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.outgoing.bytes.rate_template_VMInt_OAM_lb_8_test_nested4Level_test_nested3Level:
+      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
-      cpu_server_cmaui_test_nested4Level_test_nested3Level:
+      network.outgoing.packets.rate_template_VMInt_OAM_lb_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.outgoing.packets.rate_template_VMInt_OAM_lb_6_test_nested3Level:
+      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:
@@ -2526,25 +2538,24 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_server_cmaui:
+      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.write.bytes.rate_server_cmaui:
+      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.device.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_server_cmaui_2:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes.rate_server_cmaui:
+      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:
@@ -2563,147 +2574,137 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-      network.outpoing.packets_template_VMInt_OAM_lb_8_test_nested4Level_test_nested3Level:
+      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.write.requests.rate_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.
+      binding_server_cmaui_2:
+        type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes_server_cmaui_test_nested4Level_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.iops_server_cmaui_test_nested3Level:
+      network.outpoing.packets_template_VMInt_OAM_lb_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
-      host_server_cmaui_test_nested4Level_test_nested3Level:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
-        occurrences:
-        - 1
-        - UNBOUNDED
-      network.outgoing.bytes_template_VMInt_OAM_lb_5_test_nested3Level:
+      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
-      network.incoming.packets.rate_template_VMInt_OAM_lb_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.
+      scalable_server_cmaui_2:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.latency_server_cmaui:
+      network.outgoing.bytes_template_VMInt_OAM_lb_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.read.requests_server_cmaui:
+      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
-      disk.device.allocation_server_cmaui_test_nested3Level:
+      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.read.requests_server_cmaui_test_nested4Level_test_nested3Level:
+      network.incoming.packets.rate_template_VMInt_OAM_lb_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.capacity_server_cmaui:
+      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:
         - 1
         - UNBOUNDED
-      disk.usage_server_cmaui:
+      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.device.usage_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.device.iops_server_cmaui_test_nested3Level:
+      network.incoming.packets.rate_template_VMInt_OAM_lb_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.allocation_server_cmaui_test_nested4Level_test_nested3Level:
+      network.incoming.packets.rate_template_VMInt_OAM_lb_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:
+      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
-      disk.write.requests.rate_server_cmaui:
+      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
-      os_server_cmaui_test_nested4Level_test_nested3Level:
-        type: tosca.capabilities.OperatingSystem
+      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
-      network.incoming.packets.rate_template_VMInt_OAM_lb_4:
-        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:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_template_VMInt_OAM_lb_3:
+      network.outgoing.packets.rate_template_VMInt_OAM_lb_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_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
-      network.outgoing.packets.rate_template_VMInt_OAM_lb_5_test_nested3Level:
+      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
-      disk.root.size_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.
+      endpoint_server_cmaui_2:
+        type: tosca.capabilities.Endpoint.Admin
         occurrences:
         - 1
         - UNBOUNDED
@@ -2718,12 +2719,6 @@ node_types:
         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.
-        occurrences:
-        - 1
-        - UNBOUNDED
       binding_template_VMInt_OAM_lb_6_test_nested3Level:
         type: tosca.capabilities.network.Bindable
         valid_source_types:
@@ -2736,27 +2731,25 @@ node_types:
         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
-      network.incoming.packets.rate_template_VMInt_OAM_lb_8_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.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level:
+      network.incoming.packets.rate_template_VMInt_OAM_lb_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.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
@@ -2766,78 +2759,74 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      binding_server_cmaui:
-        type: tosca.capabilities.network.Bindable
+      network.incoming.bytes_template_VMInt_OAM_lb_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.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.outpoing.packets_template_VMInt_OAM_lb_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.incoming.bytes_template_VMInt_OAM_lb_6_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
-      disk.device.write.requests.rate_server_cmaui_test_nested4Level_test_nested3Level:
+      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
-      disk.device.read.requests.rate_server_cmaui:
+      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
-      feature_server_cmaui_test_nested4Level_test_nested3Level:
-        type: tosca.capabilities.Node
+      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
-      binding_server_cmaui_test_nested4Level_test_nested3Level:
-        type: tosca.capabilities.network.Bindable
+      host_server_cmaui_2:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_template_VMInt_OAM_lb_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.
+      os_server_cmaui_3_test_nested3Level:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes_server_cmaui_test_nested4Level_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
-      disk.write.bytes_server_cmaui:
+      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
-      host_server_cmaui_test_nested3Level:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
-        occurrences:
-        - 1
-        - UNBOUNDED
-      scalable_server_cmaui_test_nested4Level_test_nested3Level:
-        type: tosca.capabilities.Scalable
+      binding_server_cmaui_3_test_nested3Level:
+        type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
         - UNBOUNDED
@@ -2846,49 +2835,49 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes_server_cmaui_test_nested3Level:
+      network.outgoing.packets.rate_template_VMInt_OAM_lb_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.packets.rate_template_VMInt_OAM_lb_7_test_nested4Level_test_nested3Level:
+      network.outgoing.packets.rate_template_VMInt_OAM_lb_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_template_VMInt_OAM_lb_4:
+      network.outgoing.bytes.rate_template_VMInt_OAM_lb_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.outgoing.bytes.rate_template_VMInt_OAM_lb_5_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
-      network.outgoing.packets.rate_template_VMInt_OAM_lb_3:
+      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.read.bytes.rate_server_cmaui_test_nested3Level:
+      network.outgoing.packets.rate_template_VMInt_OAM_lb_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_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.device.write.requests.rate_server_cmaui_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:
@@ -2907,13 +2896,18 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-      disk.capacity_server_cmaui_test_nested3Level:
+      scalable_server_cmaui_3_test_nested3Level:
+        type: tosca.capabilities.Scalable
+        occurrences:
+        - 1
+        - UNBOUNDED
+      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.usage_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:
@@ -2925,154 +2919,160 @@ node_types:
         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.
+      endpoint_server_cmaui_3_test_nested3Level:
+        type: tosca.capabilities.Endpoint.Admin
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.allocation_server_cmaui_test_nested4Level_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
-      disk.write.requests_server_cmaui_test_nested3Level:
+      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
-      disk.latency_server_cmaui:
+      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
-      vcpus_server_cmaui:
+      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.device.write.bytes_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
-      instance_server_cmaui_test_nested3Level:
+      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_util_server_cmaui_test_nested4Level_test_nested3Level:
+      network.incoming.packets_template_VMInt_OAM_lb_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.allocation_server_cmaui:
+      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.requests_server_cmaui:
+      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
-      cpu_server_cmaui_test_nested3Level:
+      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.usage_server_cmaui_test_nested3Level:
+      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:
         - 1
         - UNBOUNDED
-      network.incoming.packets_template_VMInt_OAM_lb_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.
+      binding_server_cmaui_4_test_nested4Level_test_nested3Level:
+        type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes_server_cmaui_test_nested3Level:
+      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
-      scalable_server_cmaui_test_nested3Level:
-        type: tosca.capabilities.Scalable
+      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
-      endpoint_server_cmaui:
-        type: tosca.capabilities.Endpoint.Admin
+      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
-      cpu.delta_server_cmaui_test_nested4Level_test_nested3Level:
+      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
-      disk.device.iops_server_cmaui_test_nested4Level_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.write.bytes.rate_server_cmaui_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.device.read.requests.rate_server_cmaui_test_nested3Level:
+      feature_template_VMInt_OAM_lb_6_test_nested3Level:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      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:
+      network.incoming.bytes.rate_template_VMInt_OAM_lb_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
-      feature_template_VMInt_OAM_lb_6_test_nested3Level:
-        type: tosca.capabilities.Node
+      network.outgoing.packets.rate_template_VMInt_OAM_lb_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.incoming.bytes.rate_template_VMInt_OAM_lb_7_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_template_VMInt_OAM_lb_8_test_nested4Level_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
-      network.incoming.packets_template_VMInt_OAM_lb_7_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:
         - 1
         - UNBOUNDED
-      disk.latency_server_cmaui_test_nested4Level_test_nested3Level:
+      network.incoming.packets_template_VMInt_OAM_lb_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:
@@ -3186,14 +3186,14 @@ node_types:
         occurrences:
         - 1
         - 1
-    - dependency_server_cmaui_test_nested4Level:
+    - 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_test_nested4Level:
+    - local_storage_server_cmaui_4_test_nested4Level:
         capability: tosca.capabilities.Attachment
         node: tosca.nodes.BlockStorage
         relationship: tosca.relationships.AttachesTo
@@ -3213,14 +3213,14 @@ node_types:
         occurrences:
         - 1
         - 1
-    - dependency_server_cmaui:
+    - dependency_server_cmaui_3:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - local_storage_server_cmaui:
+    - local_storage_server_cmaui_3:
         capability: tosca.capabilities.Attachment
         node: tosca.nodes.BlockStorage
         relationship: tosca.relationships.AttachesTo
@@ -3228,48 +3228,25 @@ node_types:
         - 0
         - UNBOUNDED
     capabilities:
-      cpu.delta_server_cmaui:
+      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:
         - 1
         - UNBOUNDED
-      disk.device.write.requests.rate_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.allocation_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
-      memory_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
-      scalable_server_cmaui:
-        type: tosca.capabilities.Scalable
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.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.
-        occurrences:
-        - 1
-        - UNBOUNDED
-      instance_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
-      disk.root.size_server_cmaui_test_nested4Level:
+      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:
@@ -3281,32 +3258,25 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes_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
-      host_server_cmaui:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
-        occurrences:
-        - 1
-        - UNBOUNDED
-      cpu_util_server_cmaui:
+      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
-      cpu_server_cmaui_test_nested4Level:
+      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
-      vcpus_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:
@@ -3326,13 +3296,13 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-      disk.device.usage_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.device.write.requests_server_cmaui:
+      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:
@@ -3350,46 +3320,56 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_template_VMInt_OAM_lb_7_test_nested4Level:
+      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
-      instance_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
-      disk.latency_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
-      disk.device.read.bytes_server_cmaui:
+      feature_server_cmaui_4_test_nested4Level:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.incoming.packets_template_VMInt_OAM_lb_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.capacity_server_cmaui_test_nested4Level:
+      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.root.size_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
-      host_server_cmaui_test_nested4Level:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
+      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.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
@@ -3399,333 +3379,344 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_template_VMInt_OAM_lb_8_test_nested4Level:
+      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
-      network.incoming.bytes_template_VMInt_OAM_lb_8_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
-      os_server_cmaui:
-        type: tosca.capabilities.OperatingSystem
+      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.device.write.bytes.rate_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
-      disk.device.read.requests.rate_server_cmaui_test_nested4Level:
+      network.incoming.packets_template_VMInt_OAM_lb_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
-      network.outpoing.packets_template_VMInt_OAM_lb_5:
+      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
-      disk.allocation_server_cmaui_test_nested4Level:
+      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
-      network.outgoing.bytes_template_VMInt_OAM_lb_5:
+      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
-      network.outgoing.bytes_template_VMInt_OAM_lb_6:
+      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
-      disk.device.write.bytes.rate_server_cmaui_test_nested4Level:
+      binding_server_cmaui_4_test_nested4Level:
+        type: tosca.capabilities.network.Bindable
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.incoming.bytes_template_VMInt_OAM_lb_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.device.write.bytes_server_cmaui_test_nested4Level:
+      os_server_cmaui_4_test_nested4Level:
+        type: tosca.capabilities.OperatingSystem
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.outpoing.packets_template_VMInt_OAM_lb_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.write.requests.rate_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
-      disk.device.iops_server_cmaui_test_nested4Level:
+      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
-      network.outpoing.packets_template_VMInt_OAM_lb_6:
+      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
-      network.incoming.bytes.rate_template_VMInt_OAM_lb_8_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.read.requests_server_cmaui_test_nested4Level:
+      network.outgoing.bytes_template_VMInt_OAM_lb_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.ephemeral.size_server_cmaui_test_nested4Level:
+      network.outgoing.bytes_template_VMInt_OAM_lb_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
-      binding_server_cmaui_test_nested4Level:
-        type: tosca.capabilities.network.Bindable
+      scalable_server_cmaui_4_test_nested4Level:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_template_VMInt_OAM_lb_7_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.usage_server_cmaui_test_nested4Level:
+      network.outpoing.packets_template_VMInt_OAM_lb_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_template_VMInt_OAM_lb_5:
+      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
-      network.outgoing.bytes.rate_template_VMInt_OAM_lb_6:
+      network.incoming.bytes.rate_template_VMInt_OAM_lb_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
-      feature_server_cmaui:
-        type: tosca.capabilities.Node
+      endpoint_server_cmaui_4_test_nested4Level:
+        type: tosca.capabilities.Endpoint.Admin
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_template_VMInt_OAM_lb_5:
+      network.outpoing.packets_template_VMInt_OAM_lb_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_template_VMInt_OAM_lb_6:
+      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
-      memory.usage_server_cmaui:
+      network.outgoing.bytes.rate_template_VMInt_OAM_lb_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
-      network.incoming.packets_template_VMInt_OAM_lb_5:
+      network.outgoing.bytes.rate_template_VMInt_OAM_lb_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_template_VMInt_OAM_lb_7_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
-      disk.ephemeral.size_server_cmaui:
+      network.incoming.bytes.rate_template_VMInt_OAM_lb_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
-      network.incoming.packets_template_VMInt_OAM_lb_6:
+      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
-      binding_template_VMInt_OAM_lb_7_test_nested4Level:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        occurrences:
-        - 0
-        - UNBOUNDED
-      feature_server_cmaui_test_nested4Level:
-        type: tosca.capabilities.Node
+      network.incoming.bytes.rate_template_VMInt_OAM_lb_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.read.bytes.rate_server_cmaui_test_nested4Level:
+      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
-      network.outgoing.bytes.rate_template_VMInt_OAM_lb_8_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:
         - 1
         - UNBOUNDED
-      disk.iops_server_cmaui:
+      network.incoming.packets_template_VMInt_OAM_lb_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.iops_server_cmaui:
+      network.outgoing.bytes_template_VMInt_OAM_lb_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.capacity_server_cmaui_test_nested4Level:
+      network.incoming.packets_template_VMInt_OAM_lb_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.read.bytes_server_cmaui:
+      binding_template_VMInt_OAM_lb_7_test_nested4Level:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
+      network.outgoing.bytes.rate_template_VMInt_OAM_lb_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
-      scalable_server_cmaui_test_nested4Level:
-        type: tosca.capabilities.Scalable
+      host_server_cmaui_4_test_nested4Level:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_template_VMInt_OAM_lb_7_test_nested4Level:
+      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.device.read.bytes.rate_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.device.allocation_server_cmaui_test_nested4Level:
+      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
-      disk.device.write.requests_server_cmaui_test_nested4Level:
+      network.outgoing.packets.rate_template_VMInt_OAM_lb_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
-      cpu_server_cmaui:
+      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
-      disk.write.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
-      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.
+      feature_server_cmaui_3:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes.rate_server_cmaui:
+      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:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes.rate_server_cmaui:
+      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.device.latency_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:
         - 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_3:
+        type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.capacity_server_cmaui:
+      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
-      disk.usage_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
-      network.outgoing.packets.rate_template_VMInt_OAM_lb_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.
+      scalable_server_cmaui_3:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.usage_server_cmaui:
+      network.outgoing.packets.rate_template_VMInt_OAM_lb_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.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:
+      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:
@@ -3736,6 +3727,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      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
       network.incoming.packets.rate_template_VMInt_OAM_lb_6:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -3753,100 +3750,107 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.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.
+      feature_template_VMInt_OAM_lb_5:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests_server_cmaui:
+      endpoint_server_cmaui_3:
+        type: tosca.capabilities.Endpoint.Admin
+        occurrences:
+        - 1
+        - UNBOUNDED
+      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
-      feature_template_VMInt_OAM_lb_5:
-        type: tosca.capabilities.Node
+      network.incoming.packets.rate_template_VMInt_OAM_lb_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
-      endpoint_server_cmaui_test_nested4Level:
-        type: tosca.capabilities.Endpoint.Admin
+      os_server_cmaui_3:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      memory_server_cmaui:
+      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:
         - 1
         - UNBOUNDED
-      cpu.delta_server_cmaui_test_nested4Level:
+      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
-      network.incoming.packets.rate_template_VMInt_OAM_lb_7_test_nested4Level:
+      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
-      memory.resident_server_cmaui_test_nested4Level:
+      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
-      binding_server_cmaui:
-        type: tosca.capabilities.network.Bindable
+      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.device.read.requests.rate_server_cmaui:
+      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.write.bytes_server_cmaui:
+      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
-      network.outpoing.packets_template_VMInt_OAM_lb_8_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
-      network.outgoing.bytes_template_VMInt_OAM_lb_8_test_nested4Level:
+      network.outpoing.packets_template_VMInt_OAM_lb_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.read.bytes_server_cmaui_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
-      disk.device.read.requests_server_cmaui_test_nested4Level:
+      network.outgoing.bytes_template_VMInt_OAM_lb_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.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.
+      host_server_cmaui_3:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.latency_server_cmaui_test_nested4Level:
+      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:
@@ -3874,88 +3878,84 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      os_server_cmaui_test_nested4Level:
-        type: tosca.capabilities.OperatingSystem
-        occurrences:
-        - 1
-        - UNBOUNDED
-      memory.resident_server_cmaui:
+      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:
+      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:
         - 1
         - UNBOUNDED
-      disk.latency_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
-      vcpus_server_cmaui:
+      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.outgoing.bytes.rate_template_VMInt_OAM_lb_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.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:
+      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
-      network.outgoing.bytes.rate_template_VMInt_OAM_lb_7_test_nested4Level:
+      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.allocation_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
-      disk.write.requests_server_cmaui:
+      network.incoming.bytes_template_VMInt_OAM_lb_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
-      endpoint_server_cmaui:
-        type: tosca.capabilities.Endpoint.Admin
+      binding_template_VMInt_OAM_lb_8_test_nested4Level:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
         occurrences:
-        - 1
+        - 0
         - UNBOUNDED
-      network.incoming.bytes_template_VMInt_OAM_lb_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
-      binding_template_VMInt_OAM_lb_8_test_nested4Level:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+      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:
-        - 0
+        - 1
         - UNBOUNDED
   org.openecomp.resource.abstract.nodes.heat.nested4:
     derived_from: org.openecomp.resource.abstract.nodes.AbstractSubstitute
@@ -4041,14 +4041,14 @@ node_types:
         occurrences:
         - 1
         - 1
-    - dependency_server_cmaui:
+    - dependency_server_cmaui_4:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - local_storage_server_cmaui:
+    - local_storage_server_cmaui_4:
         capability: tosca.capabilities.Attachment
         node: tosca.nodes.BlockStorage
         relationship: tosca.relationships.AttachesTo
@@ -4056,87 +4056,72 @@ node_types:
         - 0
         - UNBOUNDED
     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.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:
+      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
-      scalable_server_cmaui:
-        type: tosca.capabilities.Scalable
+      feature_server_cmaui_4:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes.rate_server_cmaui:
+      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
-      cpu_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:
         - 1
         - UNBOUNDED
-      disk.write.bytes.rate_server_cmaui:
+      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.device.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
-      host_server_cmaui:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
-        occurrences:
-        - 1
-        - UNBOUNDED
-      cpu_util_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
-      disk.device.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.
+      binding_server_cmaui_4:
+        type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests_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
-      disk.read.requests_server_cmaui:
+      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
-      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_4:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
@@ -4147,12 +4132,6 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-      disk.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.
-        occurrences:
-        - 1
-        - UNBOUNDED
       binding_template_VMInt_OAM_lb_7:
         type: tosca.capabilities.network.Bindable
         valid_source_types:
@@ -4160,13 +4139,13 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-      disk.device.usage_server_cmaui:
+      network.incoming.bytes_template_VMInt_OAM_lb_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
-      network.incoming.bytes_template_VMInt_OAM_lb_8:
+      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:
@@ -4178,13 +4157,19 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.capacity_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.write.requests.rate_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.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:
@@ -4201,6 +4186,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      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
       network.incoming.packets.rate_template_VMInt_OAM_lb_7:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -4212,64 +4203,71 @@ node_types:
         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.
+      endpoint_server_cmaui_4:
+        type: tosca.capabilities.Endpoint.Admin
         occurrences:
         - 1
         - UNBOUNDED
-      instance_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.device.read.bytes_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
-      memory_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
-      disk.root.size_server_cmaui:
+      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
-      binding_server_cmaui:
-        type: tosca.capabilities.network.Bindable
+      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
-      disk.device.read.requests.rate_server_cmaui:
+      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.write.bytes_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
-      os_server_cmaui:
-        type: tosca.capabilities.OperatingSystem
+      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.device.write.bytes.rate_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
+      host_server_cmaui_4:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.outgoing.packets.rate_template_VMInt_OAM_lb_8:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -4288,7 +4286,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      memory.resident_server_cmaui:
+      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:
@@ -4312,107 +4310,109 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.latency_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:
         - 1
         - UNBOUNDED
-      feature_server_cmaui:
-        type: tosca.capabilities.Node
+      network.outgoing.bytes.rate_template_VMInt_OAM_lb_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.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:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes_server_cmaui:
+      network.outgoing.bytes.rate_template_VMInt_OAM_lb_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
-      network.outgoing.bytes.rate_template_VMInt_OAM_lb_7:
+      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
-      network.outgoing.bytes.rate_template_VMInt_OAM_lb_8:
+      network.incoming.bytes.rate_template_VMInt_OAM_lb_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.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:
+      network.incoming.bytes.rate_template_VMInt_OAM_lb_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
-      network.incoming.bytes.rate_template_VMInt_OAM_lb_7:
+      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:
+      network.incoming.packets_template_VMInt_OAM_lb_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
-      network.incoming.bytes.rate_template_VMInt_OAM_lb_8:
+      network.incoming.packets_template_VMInt_OAM_lb_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.ephemeral.size_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
-      network.incoming.packets_template_VMInt_OAM_lb_7:
+      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.incoming.packets_template_VMInt_OAM_lb_8:
+      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
-      endpoint_server_cmaui:
-        type: tosca.capabilities.Endpoint.Admin
+      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:
         - 1
         - UNBOUNDED
-      disk.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
-      disk.device.iops_server_cmaui:
+      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/VMInterfaceToNettworkConnection/sharedNestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/sharedNestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml
index 0a2759663e..26236a13b4 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/sharedNestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/sharedNestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml
@@ -103,20 +103,6 @@ topology_template:
           capability: tosca.capabilities.network.Bindable
           node: server_cmaui
           relationship: tosca.relationships.network.BindsTo
-    template_VMInt_OAM_lb_3:
-      type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface
-      properties:
-        security_group_refs:
-        - get_input: oam_sec_group_name
-        virtual_network_refs:
-        - get_input:
-          - p2
-          - 0
-        virtual_machine_interface_properties:
-          service_interface_type:
-            get_input: lb_st_interface_type_oam
-        port_tuple_refs:
-        - get_input: template_PortTuple_LB1
     server_cmaui:
       type: org.openecomp.resource.vfc.nodes.heat.cmaui
       properties:
@@ -131,6 +117,20 @@ topology_template:
           get_input:
           - cmaui_names
           - 0
+    template_VMInt_OAM_lb_30:
+      type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface
+      properties:
+        security_group_refs:
+        - get_input: oam_sec_group_name
+        virtual_network_refs:
+        - get_input:
+          - p2
+          - 0
+        virtual_machine_interface_properties:
+          service_interface_type:
+            get_input: lb_st_interface_type_oam
+        port_tuple_refs:
+        - get_input: template_PortTuple_LB1
     test_nested2Level:
       type: org.openecomp.resource.abstract.nodes.heat.nested2
       directives:
@@ -151,90 +151,75 @@ topology_template:
       members:
       - template_VMInt_OAM_lb_1
       - template_VMInt_OAM_lb_2
-      - template_VMInt_OAM_lb_3
       - server_cmaui
+      - template_VMInt_OAM_lb_30
       - test_nested2Level
   substitution_mappings:
     node_type: org.openecomp.resource.abstract.nodes.heat.nested1
     capabilities:
-      os_server_cmaui_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:
+      memory.resident_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.allocation_server_cmaui_test_nested3Level
+      - memory.resident_server_cmaui_3_test_nested3Level
       network.incoming.packets.rate_template_VMInt_OAM_lb_6_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.incoming.packets.rate_template_VMInt_OAM_lb_6_test_nested3Level
+      memory.resident_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - memory.resident_server_cmaui_4_test_nested4Level_test_nested3Level
       network.outpoing.packets_template_VMInt_OAM_lb_3_test_nested2Level:
       - test_nested2Level
       - network.outpoing.packets_template_VMInt_OAM_lb_3
-      disk.ephemeral.size_server_cmaui_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:
+      disk.device.latency_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.latency_server_cmaui_test_nested4Level_test_nested3Level
-      binding_template_VMInt_OAM_lb_5_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
-      - binding_template_VMInt_OAM_lb_5_test_nested3Level
-      disk.write.requests_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - disk.device.read.requests_server_cmaui_4_test_nested4Level_test_nested3Level
+      scalable_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.write.requests_server_cmaui_test_nested4Level_test_nested3Level
-      feature_server_cmaui_test_nested2Level:
-      - test_nested2Level
-      - feature_server_cmaui
-      binding_template_VMInt_OAM_lb_3:
-      - template_VMInt_OAM_lb_3
-      - binding
-      network.incoming.bytes_template_VMInt_OAM_lb_3:
-      - template_VMInt_OAM_lb_3
-      - network.incoming.bytes
-      endpoint_server_cmaui_test_nested3Level_test_nested2Level:
+      - scalable_server_cmaui_3_test_nested3Level
+      binding_template_VMInt_OAM_lb_5_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - endpoint_server_cmaui_test_nested3Level
+      - binding_template_VMInt_OAM_lb_5_test_nested3Level
       network.incoming.bytes_template_VMInt_OAM_lb_2:
       - template_VMInt_OAM_lb_2
       - network.incoming.bytes
       network.incoming.bytes_template_VMInt_OAM_lb_1:
       - template_VMInt_OAM_lb_1
       - network.incoming.bytes
-      disk.device.write.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      network.incoming.packets_template_VMInt_OAM_lb_30:
+      - template_VMInt_OAM_lb_30
+      - network.incoming.packets
+      endpoint_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.device.write.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level
+      - endpoint_server_cmaui_2
       network.outgoing.bytes.rate_template_VMInt_OAM_lb_7_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.outgoing.bytes.rate_template_VMInt_OAM_lb_7_test_nested4Level_test_nested3Level
-      instance_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - instance_server_cmaui_test_nested4Level_test_nested3Level
-      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:
+      binding_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.root.size_server_cmaui
-      disk.write.requests_server_cmaui_test_nested3Level_test_nested2Level:
+      - binding_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.latency_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.write.requests_server_cmaui_test_nested3Level
-      disk.root.size_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - disk.latency_server_cmaui_3_test_nested3Level
+      network.incoming.packets.rate_template_VMInt_OAM_lb_30:
+      - template_VMInt_OAM_lb_30
+      - network.incoming.packets.rate
+      feature_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:
+      - feature_server_cmaui_2
+      disk.capacity_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.usage_server_cmaui_test_nested4Level_test_nested3Level
+      - disk.capacity_server_cmaui_2
       instance_server_cmaui:
       - server_cmaui
       - instance
@@ -244,168 +229,168 @@ topology_template:
       network.outgoing.bytes.rate_template_VMInt_OAM_lb_8_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.outgoing.bytes.rate_template_VMInt_OAM_lb_8_test_nested4Level_test_nested3Level
+      disk.write.bytes_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - disk.write.bytes_server_cmaui_4_test_nested4Level_test_nested3Level
       network.outgoing.packets.rate_template_VMInt_OAM_lb_5_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.outgoing.packets.rate_template_VMInt_OAM_lb_5_test_nested3Level
-      cpu.delta_server_cmaui_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - cpu.delta_server_cmaui_test_nested3Level
       binding_template_VMInt_OAM_lb_3_test_nested2Level:
       - test_nested2Level
       - binding_template_VMInt_OAM_lb_3
+      disk.device.write.requests_server_cmaui_2_test_nested2Level:
+      - test_nested2Level
+      - disk.device.write.requests_server_cmaui_2
       network.outpoing.packets_template_VMInt_OAM_lb_4_test_nested2Level:
       - test_nested2Level
       - network.outpoing.packets_template_VMInt_OAM_lb_4
-      cpu_server_cmaui_test_nested2Level:
-      - test_nested2Level
-      - cpu_server_cmaui
-      os_server_cmaui:
-      - server_cmaui
-      - os
-      memory.resident_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.device.read.bytes_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - memory.resident_server_cmaui_test_nested3Level
-      os_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - disk.device.read.bytes_server_cmaui_2
+      cpu_server_cmaui_4_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:
+      - cpu_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.device.write.requests.rate_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.device.read.requests.rate_server_cmaui_test_nested3Level
-      disk.write.bytes_server_cmaui_test_nested2Level:
+      - disk.device.write.requests.rate_server_cmaui_2
+      disk.latency_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.write.bytes_server_cmaui
-      scalable_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - disk.latency_server_cmaui_4_test_nested4Level_test_nested3Level
+      os_server_cmaui:
+      - server_cmaui
+      - os
+      disk.read.bytes_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - scalable_server_cmaui_test_nested4Level_test_nested3Level
-      instance_server_cmaui_test_nested2Level:
+      - disk.read.bytes_server_cmaui_2
+      disk.device.allocation_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - instance_server_cmaui
-      endpoint_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - disk.device.allocation_server_cmaui_2
+      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
+      network.incoming.bytes.rate_template_VMInt_OAM_lb_30:
+      - template_VMInt_OAM_lb_30
+      - network.incoming.bytes.rate
+      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.incoming.packets_template_VMInt_OAM_lb_1:
       - template_VMInt_OAM_lb_1
       - network.incoming.packets
       network.incoming.packets_template_VMInt_OAM_lb_2:
       - template_VMInt_OAM_lb_2
       - network.incoming.packets
-      network.outgoing.bytes_template_VMInt_OAM_lb_3:
-      - template_VMInt_OAM_lb_3
-      - network.outgoing.bytes
-      network.incoming.packets_template_VMInt_OAM_lb_3:
-      - template_VMInt_OAM_lb_3
-      - network.incoming.packets
       network.outgoing.bytes_template_VMInt_OAM_lb_8_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.outgoing.bytes_template_VMInt_OAM_lb_8_test_nested4Level_test_nested3Level
       network.outgoing.bytes_template_VMInt_OAM_lb_1:
       - template_VMInt_OAM_lb_1
       - network.outgoing.bytes
-      disk.device.allocation_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - disk.device.allocation_server_cmaui_test_nested4Level_test_nested3Level
       network.outgoing.bytes_template_VMInt_OAM_lb_2:
       - template_VMInt_OAM_lb_2
       - network.outgoing.bytes
       binding_template_VMInt_OAM_lb_4_test_nested2Level:
       - test_nested2Level
       - binding_template_VMInt_OAM_lb_4
-      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
+      - instance_server_cmaui_3_test_nested3Level
       feature_server_cmaui:
       - server_cmaui
       - feature
-      binding_server_cmaui_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - binding_server_cmaui_test_nested3Level
       feature_test_nested2Level:
       - test_nested2Level
       - feature
+      disk.write.requests_server_cmaui_3_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - disk.write.requests_server_cmaui_3_test_nested3Level
       memory.usage_server_cmaui:
       - server_cmaui
       - memory.usage
+      cpu_server_cmaui_3_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - cpu_server_cmaui_3_test_nested3Level
+      disk.read.requests_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - disk.read.requests_server_cmaui_4_test_nested4Level_test_nested3Level
       network.outgoing.packets.rate_template_VMInt_OAM_lb_4_test_nested2Level:
       - test_nested2Level
       - network.outgoing.packets.rate_template_VMInt_OAM_lb_4
       disk.ephemeral.size_server_cmaui:
       - server_cmaui
       - disk.ephemeral.size
-      os_server_cmaui_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - os_server_cmaui_test_nested3Level
       network.incoming.bytes.rate_template_VMInt_OAM_lb_8_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.incoming.bytes.rate_template_VMInt_OAM_lb_8_test_nested4Level_test_nested3Level
-      cpu_util_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - cpu_util_server_cmaui_test_nested4Level_test_nested3Level
-      disk.write.bytes_server_cmaui_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - disk.write.bytes_server_cmaui_test_nested3Level
+      network.outpoing.packets_template_VMInt_OAM_lb_30:
+      - template_VMInt_OAM_lb_30
+      - network.outpoing.packets
       network.incoming.packets_template_VMInt_OAM_lb_3_test_nested2Level:
       - test_nested2Level
       - network.incoming.packets_template_VMInt_OAM_lb_3
       network.outgoing.packets.rate_template_VMInt_OAM_lb_6_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.outgoing.packets.rate_template_VMInt_OAM_lb_6_test_nested3Level
-      disk.device.read.requests_server_cmaui_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
-      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.rate_template_VMInt_OAM_lb_5_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.incoming.bytes.rate_template_VMInt_OAM_lb_5_test_nested3Level
       network.incoming.bytes.rate_template_VMInt_OAM_lb_6_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.incoming.bytes.rate_template_VMInt_OAM_lb_6_test_nested3Level
+      disk.device.read.requests.rate_server_cmaui_3_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - disk.device.read.requests.rate_server_cmaui_3_test_nested3Level
       binding_template_VMInt_OAM_lb_8_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - binding_template_VMInt_OAM_lb_8_test_nested4Level_test_nested3Level
-      disk.device.read.requests_server_cmaui_test_nested2Level:
-      - test_nested2Level
-      - disk.device.read.requests_server_cmaui
       cpu_server_cmaui:
       - server_cmaui
       - cpu
+      cpu_server_cmaui_2_test_nested2Level:
+      - test_nested2Level
+      - cpu_server_cmaui_2
       network.incoming.bytes_template_VMInt_OAM_lb_3_test_nested2Level:
       - test_nested2Level
       - network.incoming.bytes_template_VMInt_OAM_lb_3
       feature_template_VMInt_OAM_lb_4_test_nested2Level:
       - test_nested2Level
       - feature_template_VMInt_OAM_lb_4
+      disk.ephemeral.size_server_cmaui_3_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - disk.ephemeral.size_server_cmaui_3_test_nested3Level
       disk.device.read.bytes.rate_server_cmaui:
       - server_cmaui
       - disk.device.read.bytes.rate
-      disk.device.read.requests.rate_server_cmaui_test_nested2Level:
+      disk.root.size_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.read.requests.rate_server_cmaui
+      - disk.root.size_server_cmaui_3_test_nested3Level
       feature_template_VMInt_OAM_lb_3_test_nested2Level:
       - test_nested2Level
       - feature_template_VMInt_OAM_lb_3
+      os_server_cmaui_3_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - os_server_cmaui_3_test_nested3Level
       network.incoming.bytes_template_VMInt_OAM_lb_8_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.incoming.bytes_template_VMInt_OAM_lb_8_test_nested4Level_test_nested3Level
       network.outgoing.bytes_template_VMInt_OAM_lb_5_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.outgoing.bytes_template_VMInt_OAM_lb_5_test_nested3Level
-      disk.device.latency_server_cmaui_test_nested2Level:
+      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
-      - disk.device.latency_server_cmaui
+      - cpu_util_server_cmaui_4_test_nested4Level_test_nested3Level
       network.outgoing.bytes.rate_template_VMInt_OAM_lb_1:
       - template_VMInt_OAM_lb_1
       - network.outgoing.bytes.rate
@@ -415,6 +400,9 @@ topology_template:
       disk.read.requests_server_cmaui:
       - server_cmaui
       - disk.read.requests
+      disk.write.bytes_server_cmaui_3_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - disk.write.bytes_server_cmaui_3_test_nested3Level
       network.outgoing.bytes.rate_template_VMInt_OAM_lb_2:
       - template_VMInt_OAM_lb_2
       - network.outgoing.bytes.rate
@@ -427,336 +415,315 @@ topology_template:
       disk.device.usage_server_cmaui:
       - server_cmaui
       - disk.device.usage
+      memory_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - memory_server_cmaui_4_test_nested4Level_test_nested3Level
       disk.capacity_server_cmaui:
       - server_cmaui
       - disk.capacity
       disk.write.requests.rate_server_cmaui:
       - server_cmaui
       - disk.write.requests.rate
-      network.incoming.packets.rate_template_VMInt_OAM_lb_3:
-      - template_VMInt_OAM_lb_3
-      - network.incoming.packets.rate
+      disk.device.write.bytes_server_cmaui_2_test_nested2Level:
+      - test_nested2Level
+      - disk.device.write.bytes_server_cmaui_2
       network.incoming.packets.rate_template_VMInt_OAM_lb_2:
       - template_VMInt_OAM_lb_2
       - network.incoming.packets.rate
       network.incoming.packets.rate_template_VMInt_OAM_lb_1:
       - template_VMInt_OAM_lb_1
       - network.incoming.packets.rate
-      disk.write.bytes.rate_server_cmaui_test_nested2Level:
-      - test_nested2Level
-      - disk.write.bytes.rate_server_cmaui
+      network.incoming.bytes_template_VMInt_OAM_lb_30:
+      - template_VMInt_OAM_lb_30
+      - network.incoming.bytes
       disk.device.read.requests_server_cmaui:
       - server_cmaui
       - disk.device.read.requests
       network.incoming.packets.rate_template_VMInt_OAM_lb_7_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.incoming.packets.rate_template_VMInt_OAM_lb_7_test_nested4Level_test_nested3Level
-      disk.iops_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - disk.iops_server_cmaui_test_nested4Level_test_nested3Level
       feature_template_VMInt_OAM_lb_2:
       - template_VMInt_OAM_lb_2
       - feature
-      feature_template_VMInt_OAM_lb_3:
-      - template_VMInt_OAM_lb_3
-      - feature
-      disk.device.iops_server_cmaui_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - disk.device.iops_server_cmaui_test_nested3Level
       feature_template_VMInt_OAM_lb_1:
       - template_VMInt_OAM_lb_1
       - feature
-      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
+      - os_server_cmaui_4_test_nested4Level_test_nested3Level
       binding_server_cmaui:
       - server_cmaui
       - binding
+      disk.usage_server_cmaui_2_test_nested2Level:
+      - test_nested2Level
+      - disk.usage_server_cmaui_2
       network.incoming.packets.rate_template_VMInt_OAM_lb_8_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.incoming.packets.rate_template_VMInt_OAM_lb_8_test_nested4Level_test_nested3Level
+      disk.device.read.requests.rate_server_cmaui_2_test_nested2Level:
+      - test_nested2Level
+      - disk.device.read.requests.rate_server_cmaui_2
       disk.device.read.requests.rate_server_cmaui:
       - server_cmaui
       - disk.device.read.requests.rate
-      vcpus_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.read.bytes.rate_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - vcpus_server_cmaui_test_nested3Level
-      disk.device.capacity_server_cmaui_test_nested3Level_test_nested2Level:
+      - 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.capacity_server_cmaui_test_nested3Level
+      - disk.device.iops_server_cmaui_4_test_nested4Level_test_nested3Level
       network.outpoing.packets_template_VMInt_OAM_lb_5_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.outpoing.packets_template_VMInt_OAM_lb_5_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_test_nested2Level:
+      - 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.bytes.rate_server_cmaui_test_nested3Level_test_nested2Level:
+      - disk.write.requests.rate_server_cmaui_3_test_nested3Level
+      os_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.write.bytes.rate_server_cmaui_test_nested3Level
+      - os_server_cmaui_2
       network.outpoing.packets_template_VMInt_OAM_lb_7_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.outpoing.packets_template_VMInt_OAM_lb_7_test_nested4Level_test_nested3Level
-      disk.read.bytes_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - disk.read.bytes_server_cmaui_test_nested4Level_test_nested3Level
-      network.outgoing.packets.rate_template_VMInt_OAM_lb_3:
-      - template_VMInt_OAM_lb_3
-      - network.outgoing.packets.rate
       network.outgoing.bytes.rate_template_VMInt_OAM_lb_4_test_nested2Level:
       - test_nested2Level
       - network.outgoing.bytes.rate_template_VMInt_OAM_lb_4
-      cpu_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.read.requests_server_cmaui_3_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - disk.read.requests_server_cmaui_3_test_nested3Level
+      vcpus_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - cpu_server_cmaui_test_nested3Level
-      disk.device.read.bytes.rate_server_cmaui_test_nested2Level:
+      - vcpus_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.device.iops_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.device.read.bytes.rate_server_cmaui
-      disk.root.size_server_cmaui_test_nested3Level_test_nested2Level:
+      - disk.device.iops_server_cmaui_2
+      network.outgoing.packets.rate_template_VMInt_OAM_lb_30:
+      - template_VMInt_OAM_lb_30
+      - network.outgoing.packets.rate
+      disk.read.bytes.rate_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.root.size_server_cmaui_test_nested3Level
-      memory.usage_server_cmaui_test_nested3Level_test_nested2Level:
+      - disk.read.bytes.rate_server_cmaui_2
+      network.outgoing.bytes.rate_template_VMInt_OAM_lb_30:
+      - template_VMInt_OAM_lb_30
+      - network.outgoing.bytes.rate
+      instance_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - memory.usage_server_cmaui_test_nested3Level
-      binding_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - instance_server_cmaui_4_test_nested4Level_test_nested3Level
+      memory_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - binding_server_cmaui_test_nested4Level_test_nested3Level
+      - memory_server_cmaui_3_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:
+      endpoint_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - instance_server_cmaui_test_nested3Level
-      memory_server_cmaui_test_nested2Level:
-      - test_nested2Level
-      - memory_server_cmaui
+      - endpoint_server_cmaui_4_test_nested4Level_test_nested3Level
       disk.allocation_server_cmaui:
       - server_cmaui
       - disk.allocation
-      disk.device.write.requests_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - disk.device.write.requests_server_cmaui_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:
+      disk.device.read.bytes_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.iops_server_cmaui
+      - disk.device.read.bytes_server_cmaui_3_test_nested3Level
       network.outgoing.bytes.rate_template_VMInt_OAM_lb_6_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.outgoing.bytes.rate_template_VMInt_OAM_lb_6_test_nested3Level
-      binding_server_cmaui_test_nested2Level:
+      disk.write.bytes.rate_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - binding_server_cmaui
-      disk.device.write.bytes_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
-      - disk.device.write.bytes_server_cmaui_test_nested4Level_test_nested3Level
-      memory.usage_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - memory.usage_server_cmaui_test_nested4Level_test_nested3Level
+      - disk.device.allocation_server_cmaui_3_test_nested3Level
       cpu.delta_server_cmaui:
       - server_cmaui
       - cpu.delta
       network.outgoing.packets.rate_template_VMInt_OAM_lb_8_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.outgoing.packets.rate_template_VMInt_OAM_lb_8_test_nested4Level_test_nested3Level
-      disk.device.capacity_server_cmaui_test_nested2Level:
+      cpu_util_server_cmaui_2_test_nested2Level:
+      - test_nested2Level
+      - cpu_util_server_cmaui_2
+      memory.usage_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.device.capacity_server_cmaui
+      - memory.usage_server_cmaui_2
       network.incoming.packets_template_VMInt_OAM_lb_7_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.incoming.packets_template_VMInt_OAM_lb_7_test_nested4Level_test_nested3Level
-      disk.write.requests_server_cmaui_test_nested2Level:
+      disk.write.requests_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - disk.write.requests_server_cmaui_4_test_nested4Level_test_nested3Level
+      feature_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.write.requests_server_cmaui
+      - feature_server_cmaui_3_test_nested3Level
       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:
-      - test_nested2Level
-      - disk.device.usage_server_cmaui_test_nested4Level_test_nested3Level
-      scalable_server_cmaui_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - scalable_server_cmaui_test_nested3Level
-      disk.read.bytes_server_cmaui_test_nested2Level:
+      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.usage_server_cmaui_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - disk.usage_server_cmaui_test_nested3Level
+      - disk.device.write.requests.rate_server_cmaui_3_test_nested3Level
       cpu_util_server_cmaui:
       - server_cmaui
       - cpu_util
       network.incoming.bytes_template_VMInt_OAM_lb_6_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.incoming.bytes_template_VMInt_OAM_lb_6_test_nested3Level
+      disk.read.requests_server_cmaui_2_test_nested2Level:
+      - 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
       network.outpoing.packets_template_VMInt_OAM_lb_6_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.outpoing.packets_template_VMInt_OAM_lb_6_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.bytes.rate_server_cmaui_2
       disk.device.write.requests_server_cmaui:
       - server_cmaui
       - disk.device.write.requests
-      disk.write.requests.rate_server_cmaui_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - disk.write.requests.rate_server_cmaui_test_nested3Level
       network.incoming.packets_template_VMInt_OAM_lb_8_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.incoming.packets_template_VMInt_OAM_lb_8_test_nested4Level_test_nested3Level
-      disk.capacity_server_cmaui_test_nested2Level:
+      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
-      disk.device.usage_server_cmaui_test_nested2Level:
+      - vcpus_server_cmaui_3_test_nested3Level
+      feature_template_VMInt_OAM_lb_30:
+      - template_VMInt_OAM_lb_30
+      - feature
+      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.usage_server_cmaui_4_test_nested4Level_test_nested3Level
       disk.device.read.bytes_server_cmaui:
       - server_cmaui
       - disk.device.read.bytes
+      disk.capacity_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - disk.capacity_server_cmaui_4_test_nested4Level_test_nested3Level
       network.outgoing.packets.rate_template_VMInt_OAM_lb_2:
       - template_VMInt_OAM_lb_2
       - network.outgoing.packets.rate
-      cpu_util_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.device.write.bytes.rate_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - cpu_util_server_cmaui_test_nested3Level
+      - disk.device.write.bytes.rate_server_cmaui_2
       network.outgoing.packets.rate_template_VMInt_OAM_lb_1:
       - template_VMInt_OAM_lb_1
       - network.outgoing.packets.rate
       disk.root.size_server_cmaui:
       - server_cmaui
       - disk.root.size
-      disk.latency_server_cmaui_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - disk.latency_server_cmaui_test_nested3Level
-      disk.device.write.requests.rate_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - disk.device.write.requests.rate_server_cmaui_test_nested4Level_test_nested3Level
-      vcpus_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - vcpus_server_cmaui_test_nested4Level_test_nested3Level
       network.incoming.bytes_template_VMInt_OAM_lb_5_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.incoming.bytes_template_VMInt_OAM_lb_5_test_nested3Level
-      disk.capacity_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.device.read.requests_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.capacity_server_cmaui_test_nested3Level
-      disk.device.write.requests.rate_server_cmaui_test_nested2Level:
+      - disk.device.read.requests_server_cmaui_2
+      memory.resident_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.device.write.requests.rate_server_cmaui
+      - memory.resident_server_cmaui_2
+      disk.device.iops_server_cmaui_3_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - disk.device.iops_server_cmaui_3_test_nested3Level
+      disk.allocation_server_cmaui_2_test_nested2Level:
+      - test_nested2Level
+      - disk.allocation_server_cmaui_2
       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.outpoing.packets_template_VMInt_OAM_lb_1:
       - template_VMInt_OAM_lb_1
       - network.outpoing.packets
-      network.outpoing.packets_template_VMInt_OAM_lb_3:
-      - template_VMInt_OAM_lb_3
-      - network.outpoing.packets
       network.outpoing.packets_template_VMInt_OAM_lb_2:
       - template_VMInt_OAM_lb_2
       - network.outpoing.packets
-      disk.device.read.bytes_server_cmaui_test_nested2Level:
-      - test_nested2Level
-      - disk.device.read.bytes_server_cmaui
-      disk.device.write.requests.rate_server_cmaui_test_nested3Level_test_nested2Level:
+      memory.usage_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:
+      - memory.usage_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.device.write.requests_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - cpu_util_server_cmaui
-      disk.write.requests.rate_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - disk.device.write.requests_server_cmaui_3_test_nested3Level
+      disk.write.requests_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.write.requests.rate_server_cmaui_test_nested4Level_test_nested3Level
-      disk.device.write.bytes_server_cmaui_test_nested3Level_test_nested2Level:
+      - disk.write.requests_server_cmaui_2
+      disk.read.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.write.bytes_server_cmaui_test_nested3Level
-      host_server_cmaui_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
-      - host_server_cmaui
-      memory_server_cmaui_test_nested3Level_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
-      - memory_server_cmaui_test_nested3Level
+      - scalable_server_cmaui_4_test_nested4Level_test_nested3Level
       network.incoming.packets_template_VMInt_OAM_lb_6_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.incoming.packets_template_VMInt_OAM_lb_6_test_nested3Level
+      disk.allocation_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - disk.allocation_server_cmaui_4_test_nested4Level_test_nested3Level
       network.incoming.bytes.rate_template_VMInt_OAM_lb_3_test_nested2Level:
       - test_nested2Level
       - network.incoming.bytes.rate_template_VMInt_OAM_lb_3
+      disk.device.read.bytes.rate_server_cmaui_2_test_nested2Level:
+      - test_nested2Level
+      - disk.device.read.bytes.rate_server_cmaui_2
       network.incoming.packets_template_VMInt_OAM_lb_5_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.incoming.packets_template_VMInt_OAM_lb_5_test_nested3Level
-      disk.device.read.bytes.rate_server_cmaui_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - disk.device.read.bytes.rate_server_cmaui_test_nested3Level
-      network.outgoing.bytes.rate_template_VMInt_OAM_lb_3:
-      - template_VMInt_OAM_lb_3
-      - network.outgoing.bytes.rate
       feature_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - feature_test_nested4Level_test_nested3Level
       network.incoming.bytes.rate_template_VMInt_OAM_lb_1:
       - template_VMInt_OAM_lb_1
       - network.incoming.bytes.rate
-      disk.latency_server_cmaui_test_nested2Level:
-      - test_nested2Level
-      - disk.latency_server_cmaui
       network.incoming.bytes.rate_template_VMInt_OAM_lb_2:
       - template_VMInt_OAM_lb_2
       - network.incoming.bytes.rate
-      disk.device.write.requests_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.device.usage_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.device.write.requests_server_cmaui_test_nested3Level
-      network.incoming.bytes.rate_template_VMInt_OAM_lb_3:
-      - template_VMInt_OAM_lb_3
-      - network.incoming.bytes.rate
-      vcpus_server_cmaui_test_nested2Level:
-      - test_nested2Level
-      - vcpus_server_cmaui
-      disk.device.write.bytes.rate_server_cmaui_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - disk.device.write.bytes.rate_server_cmaui_test_nested3Level
-      disk.iops_server_cmaui_test_nested2Level:
+      - disk.device.usage_server_cmaui_2
+      cpu.delta_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.iops_server_cmaui
-      memory.usage_server_cmaui_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
-      - memory.usage_server_cmaui
+      - disk.device.write.bytes.rate_server_cmaui_3_test_nested3Level
+      binding_template_VMInt_OAM_lb_30:
+      - template_VMInt_OAM_lb_30
+      - binding
       disk.iops_server_cmaui:
       - server_cmaui
       - disk.iops
       disk.read.bytes_server_cmaui:
       - server_cmaui
       - disk.read.bytes
+      endpoint_server_cmaui_3_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - endpoint_server_cmaui_3_test_nested3Level
       feature_template_VMInt_OAM_lb_5_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - feature_template_VMInt_OAM_lb_5_test_nested3Level
@@ -766,117 +733,147 @@ topology_template:
       feature_template_VMInt_OAM_lb_8_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - feature_template_VMInt_OAM_lb_8_test_nested4Level_test_nested3Level
-      disk.read.requests_server_cmaui_test_nested2Level:
+      binding_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.read.requests_server_cmaui
+      - binding_server_cmaui_3_test_nested3Level
       network.incoming.packets.rate_template_VMInt_OAM_lb_3_test_nested2Level:
       - test_nested2Level
       - network.incoming.packets.rate_template_VMInt_OAM_lb_3
+      disk.ephemeral.size_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - disk.ephemeral.size_server_cmaui_4_test_nested4Level_test_nested3Level
       network.outgoing.bytes_template_VMInt_OAM_lb_3_test_nested2Level:
       - test_nested2Level
       - network.outgoing.bytes_template_VMInt_OAM_lb_3
-      feature_server_cmaui_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - feature_server_cmaui_test_nested3Level
-      memory_server_cmaui_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.iops_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - cpu_server_cmaui_test_nested4Level_test_nested3Level
+      - disk.iops_server_cmaui_2
       disk.write.bytes.rate_server_cmaui:
       - server_cmaui
       - disk.write.bytes.rate
       feature_template_VMInt_OAM_lb_7_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - feature_template_VMInt_OAM_lb_7_test_nested4Level_test_nested3Level
-      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:
-      - test_nested2Level
-      - disk.device.read.bytes_server_cmaui_test_nested4Level_test_nested3Level
       network.incoming.bytes_template_VMInt_OAM_lb_4_test_nested2Level:
       - test_nested2Level
       - network.incoming.bytes_template_VMInt_OAM_lb_4
-      disk.device.read.requests.rate_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.iops_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.read.requests.rate_server_cmaui_test_nested4Level_test_nested3Level
+      - disk.iops_server_cmaui_4_test_nested4Level_test_nested3Level
       network.outgoing.bytes_template_VMInt_OAM_lb_4_test_nested2Level:
       - test_nested2Level
       - network.outgoing.bytes_template_VMInt_OAM_lb_4
+      instance_server_cmaui_2_test_nested2Level:
+      - test_nested2Level
+      - instance_server_cmaui_2
       disk.device.capacity_server_cmaui:
       - server_cmaui
       - disk.device.capacity
-      disk.device.write.bytes_server_cmaui_test_nested2Level:
+      disk.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.write.bytes_server_cmaui
-      disk.device.read.requests_server_cmaui_test_nested3Level_test_nested2Level:
+      - disk.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level
+      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
       feature_template_VMInt_OAM_lb_6_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - feature_template_VMInt_OAM_lb_6_test_nested3Level
-      disk.write.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      memory_server_cmaui_2_test_nested2Level:
+      - test_nested2Level
+      - memory_server_cmaui_2
+      disk.usage_server_cmaui_3_test_nested3Level_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:
+      - disk.usage_server_cmaui_3_test_nested3Level
+      disk.device.allocation_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.read.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level
+      - disk.device.allocation_server_cmaui_4_test_nested4Level_test_nested3Level
       memory_server_cmaui:
       - server_cmaui
       - memory
-      scalable_server_cmaui_test_nested2Level:
+      disk.device.latency_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - scalable_server_cmaui
-      disk.usage_server_cmaui_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
       network.incoming.bytes_template_VMInt_OAM_lb_7_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.incoming.bytes_template_VMInt_OAM_lb_7_test_nested4Level_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.latency_server_cmaui_2
+      disk.allocation_server_cmaui_3_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - disk.allocation_server_cmaui_3_test_nested3Level
+      disk.ephemeral.size_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.device.capacity_server_cmaui_test_nested4Level_test_nested3Level
+      - disk.ephemeral.size_server_cmaui_2
       network.outgoing.bytes.rate_template_VMInt_OAM_lb_3_test_nested2Level:
       - test_nested2Level
       - network.outgoing.bytes.rate_template_VMInt_OAM_lb_3
       network.outpoing.packets_template_VMInt_OAM_lb_8_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.outpoing.packets_template_VMInt_OAM_lb_8_test_nested4Level_test_nested3Level
-      disk.write.bytes_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.usage_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.write.bytes_server_cmaui_test_nested4Level_test_nested3Level
-      memory.resident_server_cmaui_test_nested2Level:
+      - disk.usage_server_cmaui_4_test_nested4Level_test_nested3Level
+      host_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - memory.resident_server_cmaui
-      host_server_cmaui_test_nested4Level_test_nested3Level_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
       network.incoming.packets_template_VMInt_OAM_lb_4_test_nested2Level:
       - test_nested2Level
       - network.incoming.packets_template_VMInt_OAM_lb_4
-      host_server_cmaui_test_nested3Level_test_nested2Level:
+      binding_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - host_server_cmaui_test_nested3Level
+      - binding_server_cmaui_2
       network.incoming.bytes.rate_template_VMInt_OAM_lb_7_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.incoming.bytes.rate_template_VMInt_OAM_lb_7_test_nested4Level_test_nested3Level
+      cpu.delta_server_cmaui_2_test_nested2Level:
+      - test_nested2Level
+      - cpu.delta_server_cmaui_2
+      disk.device.capacity_server_cmaui_2_test_nested2Level:
+      - test_nested2Level
+      - disk.device.capacity_server_cmaui_2
       network.outgoing.bytes_template_VMInt_OAM_lb_7_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.outgoing.bytes_template_VMInt_OAM_lb_7_test_nested4Level_test_nested3Level
       network.outgoing.bytes.rate_template_VMInt_OAM_lb_5_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.outgoing.bytes.rate_template_VMInt_OAM_lb_5_test_nested3Level
-      disk.device.write.requests_server_cmaui_test_nested2Level:
+      disk.device.write.requests_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - disk.device.write.requests_server_cmaui_4_test_nested4Level_test_nested3Level
+      network.outgoing.bytes_template_VMInt_OAM_lb_30:
+      - template_VMInt_OAM_lb_30
+      - network.outgoing.bytes
+      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
-      - disk.device.write.requests_server_cmaui
+      - 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.iops_server_cmaui_3_test_nested3Level
       memory.resident_server_cmaui:
       - server_cmaui
       - memory.resident
-      disk.read.bytes.rate_server_cmaui_test_nested2Level:
+      vcpus_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.read.bytes.rate_server_cmaui
+      - vcpus_server_cmaui_2
       network.outgoing.packets.rate_template_VMInt_OAM_lb_3_test_nested2Level:
       - test_nested2Level
       - network.outgoing.packets.rate_template_VMInt_OAM_lb_3
@@ -886,30 +883,33 @@ topology_template:
       network.incoming.packets.rate_template_VMInt_OAM_lb_5_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.incoming.packets.rate_template_VMInt_OAM_lb_5_test_nested3Level
-      disk.allocation_server_cmaui_test_nested2Level:
-      - test_nested2Level
-      - disk.allocation_server_cmaui
-      disk.allocation_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - disk.allocation_server_cmaui_test_nested4Level_test_nested3Level
       binding_template_VMInt_OAM_lb_2:
       - template_VMInt_OAM_lb_2
       - binding
       binding_template_VMInt_OAM_lb_1:
       - template_VMInt_OAM_lb_1
       - binding
+      disk.device.read.bytes.rate_server_cmaui_3_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - disk.device.read.bytes.rate_server_cmaui_3_test_nested3Level
       disk.write.requests_server_cmaui:
       - server_cmaui
       - disk.write.requests
-      cpu.delta_server_cmaui_test_nested2Level:
+      disk.write.requests.rate_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - cpu.delta_server_cmaui
+      - disk.write.requests.rate_server_cmaui_2
+      disk.write.bytes_server_cmaui_2_test_nested2Level:
+      - test_nested2Level
+      - disk.write.bytes_server_cmaui_2
       feature_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - feature_test_nested3Level
-      memory.resident_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.device.usage_server_cmaui_3_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - disk.device.usage_server_cmaui_3_test_nested3Level
+      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
       endpoint_server_cmaui:
       - server_cmaui
       - endpoint
@@ -919,16 +919,19 @@ topology_template:
       network.incoming.bytes.rate_template_VMInt_OAM_lb_4_test_nested2Level:
       - test_nested2Level
       - network.incoming.bytes.rate_template_VMInt_OAM_lb_4
+      disk.device.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - disk.device.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level
       network.outgoing.bytes_template_VMInt_OAM_lb_6_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.outgoing.bytes_template_VMInt_OAM_lb_6_test_nested3Level
-      disk.read.requests_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      host_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.read.requests_server_cmaui_test_nested4Level_test_nested3Level
-      disk.allocation_server_cmaui_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - disk.allocation_server_cmaui_test_nested3Level
+      - host_server_cmaui_2
     requirements:
+      dependency_template_VMInt_OAM_lb_30:
+      - template_VMInt_OAM_lb_30
+      - dependency
       dependency_template_VMInt_OAM_lb_7_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - dependency_template_VMInt_OAM_lb_7_test_nested4Level_test_nested3Level
@@ -938,6 +941,9 @@ topology_template:
       dependency_server_cmaui:
       - server_cmaui
       - dependency
+      local_storage_server_cmaui_2_test_nested2Level:
+      - test_nested2Level
+      - local_storage_server_cmaui_2
       link_template_VMInt_OAM_lb_4_test_nested2Level:
       - test_nested2Level
       - link_template_VMInt_OAM_lb_4
@@ -956,27 +962,33 @@ topology_template:
       dependency_template_VMInt_OAM_lb_5_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - dependency_template_VMInt_OAM_lb_5_test_nested3Level
-      dependency_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - dependency_server_cmaui_test_nested4Level_test_nested3Level
       link_template_VMInt_OAM_lb_3_test_nested2Level:
       - test_nested2Level
       - link_template_VMInt_OAM_lb_3
-      link_template_VMInt_OAM_lb_3:
-      - template_VMInt_OAM_lb_3
-      - link
       link_template_VMInt_OAM_lb_2:
       - template_VMInt_OAM_lb_2
       - link
-      binding_template_VMInt_OAM_lb_3:
-      - template_VMInt_OAM_lb_3
-      - binding
-      dependency_server_cmaui_test_nested2Level:
+      dependency_server_cmaui_2_test_nested2Level:
+      - test_nested2Level
+      - dependency_server_cmaui_2
+      local_storage_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - dependency_server_cmaui
+      - local_storage_server_cmaui_3_test_nested3Level
+      dependency_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - dependency_server_cmaui_4_test_nested4Level_test_nested3Level
+      link_template_VMInt_OAM_lb_30:
+      - template_VMInt_OAM_lb_30
+      - link
       link_template_VMInt_OAM_lb_5_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - link_template_VMInt_OAM_lb_5_test_nested3Level
+      local_storage_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - local_storage_server_cmaui_4_test_nested4Level_test_nested3Level
+      dependency_server_cmaui_3_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - dependency_server_cmaui_3_test_nested3Level
       dependency_template_VMInt_OAM_lb_1:
       - template_VMInt_OAM_lb_1
       - dependency
@@ -986,24 +998,15 @@ topology_template:
       dependency_template_VMInt_OAM_lb_3_test_nested2Level:
       - test_nested2Level
       - dependency_template_VMInt_OAM_lb_3
-      dependency_template_VMInt_OAM_lb_3:
-      - template_VMInt_OAM_lb_3
-      - dependency
       dependency_template_VMInt_OAM_lb_8_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - dependency_template_VMInt_OAM_lb_8_test_nested4Level_test_nested3Level
       local_storage_server_cmaui:
       - server_cmaui
       - local_storage
-      local_storage_server_cmaui_test_nested2Level:
-      - test_nested2Level
-      - local_storage_server_cmaui
-      dependency_server_cmaui_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - dependency_server_cmaui_test_nested3Level
-      local_storage_server_cmaui_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - local_storage_server_cmaui_test_nested3Level
+      binding_template_VMInt_OAM_lb_30:
+      - template_VMInt_OAM_lb_30
+      - binding
       dependency_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - dependency_test_nested4Level_test_nested3Level
@@ -1015,7 +1018,4 @@ topology_template:
       - dependency_template_VMInt_OAM_lb_6_test_nested3Level
       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
\ No newline at end of file
+      - dependency_test_nested3Level
\ 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/VMInterfaceToNettworkConnection/sharedNestedMultiLevels/expectedoutputfiles/nested2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/sharedNestedMultiLevels/expectedoutputfiles/nested2ServiceTemplate.yaml
index 4e6471a4cb..255b99a357 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/sharedNestedMultiLevels/expectedoutputfiles/nested2ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/sharedNestedMultiLevels/expectedoutputfiles/nested2ServiceTemplate.yaml
@@ -68,6 +68,20 @@ topology_template:
       type: string
       description: UID of OAM network
   node_templates:
+    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
+        contrail_service_instance_ind: true
+        name:
+          get_input:
+          - cmaui_names
+          - 0
     test_nested3Level:
       type: org.openecomp.resource.abstract.nodes.heat.nested3
       directives:
@@ -101,7 +115,7 @@ topology_template:
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
-          node: server_cmaui
+          node: server_cmaui_2
           relationship: tosca.relationships.network.BindsTo
     template_VMInt_OAM_lb_4:
       type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface
@@ -119,22 +133,8 @@ topology_template:
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
-          node: server_cmaui
+          node: server_cmaui_2
           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
-        contrail_service_instance_ind: true
-        name:
-          get_input:
-          - cmaui_names
-          - 0
   groups:
     nested2_group:
       type: org.openecomp.groups.heat.HeatStack
@@ -142,175 +142,178 @@ topology_template:
         heat_file: ../Artifacts/nested2.yml
         description: nested2
       members:
+      - server_cmaui_2
       - test_nested3Level
       - template_VMInt_OAM_lb_3
       - template_VMInt_OAM_lb_4
-      - server_cmaui
   substitution_mappings:
     node_type: org.openecomp.resource.abstract.nodes.heat.nested2
     capabilities:
       network.incoming.bytes.rate_template_VMInt_OAM_lb_8_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.incoming.bytes.rate_template_VMInt_OAM_lb_8_test_nested4Level
-      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:
+      instance_server_cmaui_4_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
+      memory.usage_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - vcpus_server_cmaui
-      disk.device.allocation_server_cmaui:
-      - server_cmaui
-      - disk.device.allocation
+      - memory.usage_server_cmaui_3
+      cpu_util_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - cpu_util_server_cmaui_3
       feature_template_VMInt_OAM_lb_7_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - feature_template_VMInt_OAM_lb_7_test_nested4Level
-      disk.latency_server_cmaui_test_nested3Level:
-      - test_nested3Level
-      - disk.latency_server_cmaui
-      disk.device.capacity_server_cmaui_test_nested4Level_test_nested3Level:
+      disk.device.usage_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.usage
+      disk.device.usage_server_cmaui_4_test_nested4Level_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
+      - disk.device.usage_server_cmaui_4_test_nested4Level
       network.incoming.bytes.rate_template_VMInt_OAM_lb_6_test_nested3Level:
       - test_nested3Level
       - network.incoming.bytes.rate_template_VMInt_OAM_lb_6
-      memory.resident_server_cmaui_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - memory.resident_server_cmaui_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:
-      - test_nested3Level
-      - os_server_cmaui
-      disk.device.read.bytes_server_cmaui_test_nested4Level_test_nested3Level:
+      disk.device.latency_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.latency
+      disk.usage_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - disk.device.read.bytes_server_cmaui_test_nested4Level
-      disk.device.read.bytes.rate_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.rate_server_cmaui_test_nested4Level
-      memory.usage_server_cmaui_test_nested4Level_test_nested3Level:
+      - disk.read.requests_server_cmaui_3
+      disk.latency_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - memory.usage_server_cmaui_test_nested4Level
+      - disk.latency_server_cmaui_3
       binding_template_VMInt_OAM_lb_4:
       - template_VMInt_OAM_lb_4
       - binding
+      disk.write.bytes.rate_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - disk.write.bytes.rate_server_cmaui_3
       binding_template_VMInt_OAM_lb_3:
       - template_VMInt_OAM_lb_3
       - binding
+      endpoint_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - endpoint_server_cmaui_4_test_nested4Level
       network.incoming.bytes_template_VMInt_OAM_lb_4:
       - template_VMInt_OAM_lb_4
       - network.incoming.bytes
-      disk.device.write.requests_server_cmaui:
-      - server_cmaui
-      - disk.device.write.requests
+      disk.read.requests_server_cmaui_2:
+      - server_cmaui_2
+      - disk.read.requests
       network.incoming.bytes_template_VMInt_OAM_lb_3:
       - template_VMInt_OAM_lb_3
       - network.incoming.bytes
-      network.outgoing.bytes_template_VMInt_OAM_lb_7_test_nested4Level_test_nested3Level:
+      cpu_util_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - network.outgoing.bytes_template_VMInt_OAM_lb_7_test_nested4Level
-      instance_server_cmaui_test_nested4Level_test_nested3Level:
+      - cpu_util_server_cmaui_4_test_nested4Level
+      disk.write.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - instance_server_cmaui_test_nested4Level
-      disk.device.capacity_server_cmaui_test_nested3Level:
+      - disk.write.bytes.rate_server_cmaui_4_test_nested4Level
+      network.outgoing.bytes_template_VMInt_OAM_lb_7_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - disk.device.capacity_server_cmaui
+      - network.outgoing.bytes_template_VMInt_OAM_lb_7_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
-      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
       network.outgoing.bytes.rate_template_VMInt_OAM_lb_6_test_nested3Level:
       - test_nested3Level
       - network.outgoing.bytes.rate_template_VMInt_OAM_lb_6
-      memory.usage_server_cmaui_test_nested3Level:
+      disk.device.capacity_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.capacity
+      host_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - 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
-      - memory.usage_server_cmaui
+      - disk.ephemeral.size_server_cmaui_4_test_nested4Level
+      disk.read.bytes_server_cmaui_2:
+      - server_cmaui_2
+      - disk.read.bytes
       feature_template_VMInt_OAM_lb_8_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - feature_template_VMInt_OAM_lb_8_test_nested4Level
-      instance_server_cmaui:
-      - server_cmaui
-      - instance
-      disk.device.read.bytes_server_cmaui:
-      - server_cmaui
+      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
-      - memory_server_cmaui
+      - disk.root.size_server_cmaui_4_test_nested4Level
+      disk.write.requests.rate_server_cmaui_2:
+      - server_cmaui_2
+      - disk.write.requests.rate
       network.incoming.bytes.rate_template_VMInt_OAM_lb_5_test_nested3Level:
       - test_nested3Level
       - network.incoming.bytes.rate_template_VMInt_OAM_lb_5
-      os_server_cmaui:
-      - server_cmaui
-      - os
-      disk.device.write.bytes.rate_server_cmaui:
-      - server_cmaui
-      - disk.device.write.bytes.rate
-      disk.device.latency_server_cmaui_test_nested4Level_test_nested3Level:
+      disk.iops_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - disk.device.latency_server_cmaui_test_nested4Level
+      - disk.iops_server_cmaui_4_test_nested4Level
+      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
+      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.outpoing.packets_template_VMInt_OAM_lb_3:
       - template_VMInt_OAM_lb_3
       - network.outpoing.packets
       network.incoming.packets_template_VMInt_OAM_lb_5_test_nested3Level:
       - test_nested3Level
       - network.incoming.packets_template_VMInt_OAM_lb_5
-      disk.ephemeral.size_server_cmaui_test_nested3Level:
-      - test_nested3Level
-      - disk.ephemeral.size_server_cmaui
       network.outpoing.packets_template_VMInt_OAM_lb_4:
       - template_VMInt_OAM_lb_4
       - network.outpoing.packets
       network.outgoing.bytes.rate_template_VMInt_OAM_lb_7_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.outgoing.bytes.rate_template_VMInt_OAM_lb_7_test_nested4Level
-      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
-      - disk.write.requests.rate_server_cmaui_test_nested4Level
-      vcpus_server_cmaui_test_nested4Level_test_nested3Level:
+      - cpu.delta_server_cmaui_4_test_nested4Level
+      disk.write.requests_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - vcpus_server_cmaui_test_nested4Level
+      - disk.write.requests_server_cmaui_3
+      disk.capacity_server_cmaui_2:
+      - server_cmaui_2
+      - disk.capacity
       network.outgoing.bytes_template_VMInt_OAM_lb_3:
       - template_VMInt_OAM_lb_3
       - network.outgoing.bytes
       network.incoming.packets_template_VMInt_OAM_lb_3:
       - template_VMInt_OAM_lb_3
       - network.incoming.packets
-      cpu_util_server_cmaui_test_nested3Level:
-      - test_nested3Level
-      - cpu_util_server_cmaui
       network.outgoing.bytes_template_VMInt_OAM_lb_4:
       - template_VMInt_OAM_lb_4
       - network.outgoing.bytes
@@ -320,276 +323,264 @@ topology_template:
       binding_template_VMInt_OAM_lb_5_test_nested3Level:
       - test_nested3Level
       - binding_template_VMInt_OAM_lb_5
-      endpoint_server_cmaui_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - endpoint_server_cmaui_test_nested4Level
-      disk.allocation_server_cmaui_test_nested3Level:
-      - test_nested3Level
-      - disk.allocation_server_cmaui
-      memory.resident_server_cmaui_test_nested3Level:
-      - test_nested3Level
-      - memory.resident_server_cmaui
-      disk.ephemeral.size_server_cmaui_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.ephemeral.size_server_cmaui_test_nested4Level
-      cpu.delta_server_cmaui_test_nested3Level:
+      disk.read.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - cpu.delta_server_cmaui
-      disk.device.read.bytes_server_cmaui_test_nested3Level:
+      - disk.read.bytes.rate_server_cmaui_4_test_nested4Level
+      disk.read.bytes.rate_server_cmaui_3_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.read.bytes.rate_server_cmaui_3
       network.outgoing.bytes_template_VMInt_OAM_lb_8_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.outgoing.bytes_template_VMInt_OAM_lb_8_test_nested4Level
-      disk.write.requests_server_cmaui_test_nested4Level_test_nested3Level:
+      disk.device.iops_server_cmaui_4_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
       network.outgoing.bytes.rate_template_VMInt_OAM_lb_3:
       - template_VMInt_OAM_lb_3
       - network.outgoing.bytes.rate
-      disk.device.read.bytes.rate_server_cmaui_test_nested3Level:
-      - test_nested3Level
-      - disk.device.read.bytes.rate_server_cmaui
       network.outgoing.bytes.rate_template_VMInt_OAM_lb_4:
       - template_VMInt_OAM_lb_4
       - network.outgoing.bytes.rate
-      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.iops_server_cmaui_2:
+      - server_cmaui_2
+      - disk.iops
       network.incoming.bytes.rate_template_VMInt_OAM_lb_3:
       - template_VMInt_OAM_lb_3
       - network.incoming.bytes.rate
-      disk.device.write.requests_server_cmaui_test_nested3Level:
-      - test_nested3Level
-      - disk.device.write.requests_server_cmaui
       network.incoming.bytes.rate_template_VMInt_OAM_lb_4:
       - template_VMInt_OAM_lb_4
       - network.incoming.bytes.rate
-      memory.usage_server_cmaui:
-      - server_cmaui
-      - memory.usage
+      disk.device.write.requests_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.write.requests
       network.incoming.bytes_template_VMInt_OAM_lb_8_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.incoming.bytes_template_VMInt_OAM_lb_8_test_nested4Level
-      disk.ephemeral.size_server_cmaui:
-      - server_cmaui
-      - disk.ephemeral.size
-      memory_server_cmaui_test_nested4Level_test_nested3Level:
+      memory_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - memory_server_cmaui_3
+      feature_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - memory_server_cmaui_test_nested4Level
+      - feature_server_cmaui_3
       network.incoming.packets.rate_template_VMInt_OAM_lb_7_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.incoming.packets.rate_template_VMInt_OAM_lb_7_test_nested4Level
-      disk.device.usage_server_cmaui_test_nested3Level:
+      disk.device.write.bytes.rate_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - disk.device.usage_server_cmaui
+      - disk.device.write.bytes.rate_server_cmaui_3
       network.incoming.packets.rate_template_VMInt_OAM_lb_6_test_nested3Level:
       - test_nested3Level
       - network.incoming.packets.rate_template_VMInt_OAM_lb_6
+      disk.root.size_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - disk.root.size_server_cmaui_3
+      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
       network.outpoing.packets_template_VMInt_OAM_lb_5_test_nested3Level:
       - test_nested3Level
       - network.outpoing.packets_template_VMInt_OAM_lb_5
-      disk.iops_server_cmaui:
-      - server_cmaui
-      - disk.iops
-      disk.iops_server_cmaui_test_nested4Level_test_nested3Level:
+      disk.device.write.requests_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - disk.iops_server_cmaui_test_nested4Level
-      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.write.requests_server_cmaui_3
+      disk.device.read.requests.rate_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - disk.root.size_server_cmaui
+      - 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.device.write.requests.rate_server_cmaui_3
+      disk.device.write.bytes.rate_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.write.bytes.rate
       network.outgoing.bytes.rate_template_VMInt_OAM_lb_8_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.outgoing.bytes.rate_template_VMInt_OAM_lb_8_test_nested4Level
-      cpu_server_cmaui_test_nested4Level_test_nested3Level:
+      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
-      - cpu_server_cmaui_test_nested4Level
+      - 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
+      disk.device.write.bytes_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.write.bytes
       network.outgoing.packets.rate_template_VMInt_OAM_lb_6_test_nested3Level:
       - test_nested3Level
       - network.outgoing.packets.rate_template_VMInt_OAM_lb_6
+      disk.iops_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - disk.iops_server_cmaui_3
       feature_template_VMInt_OAM_lb_5_test_nested3Level:
       - test_nested3Level
       - feature_template_VMInt_OAM_lb_5
-      cpu_server_cmaui:
-      - server_cmaui
-      - cpu
-      disk.write.bytes.rate_server_cmaui:
-      - server_cmaui
-      - disk.write.bytes.rate
-      disk.device.write.bytes_server_cmaui_test_nested4Level_test_nested3Level:
+      cpu_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - disk.device.write.bytes_server_cmaui_test_nested4Level
-      disk.device.read.bytes.rate_server_cmaui:
-      - server_cmaui
-      - disk.device.read.bytes.rate
+      - cpu_server_cmaui_3
+      disk.write.bytes_server_cmaui_2:
+      - server_cmaui_2
+      - disk.write.bytes
+      feature_server_cmaui_2:
+      - server_cmaui_2
+      - feature
+      disk.allocation_server_cmaui_2:
+      - server_cmaui_2
+      - disk.allocation
       network.incoming.bytes_template_VMInt_OAM_lb_5_test_nested3Level:
       - test_nested3Level
       - network.incoming.bytes_template_VMInt_OAM_lb_5
       binding_template_VMInt_OAM_lb_7_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - binding_template_VMInt_OAM_lb_7_test_nested4Level
+      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.outpoing.packets_template_VMInt_OAM_lb_8_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.outpoing.packets_template_VMInt_OAM_lb_8_test_nested4Level
-      disk.write.requests.rate_server_cmaui_test_nested3Level:
+      instance_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - disk.write.requests.rate_server_cmaui
-      disk.write.bytes_server_cmaui_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.write.bytes_server_cmaui_test_nested4Level
-      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
+      - instance_server_cmaui_3
+      scalable_server_cmaui_2:
+      - server_cmaui_2
+      - scalable
       network.outgoing.bytes_template_VMInt_OAM_lb_5_test_nested3Level:
       - test_nested3Level
       - network.outgoing.bytes_template_VMInt_OAM_lb_5
-      network.incoming.packets.rate_template_VMInt_OAM_lb_5_test_nested3Level:
+      disk.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - network.incoming.packets.rate_template_VMInt_OAM_lb_5
-      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:
+      - disk.write.requests.rate_server_cmaui_4_test_nested4Level
+      disk.capacity_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - disk.device.allocation_server_cmaui
-      disk.device.read.requests_server_cmaui_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.device.usage_server_cmaui:
-      - server_cmaui
-      - disk.device.usage
-      disk.device.iops_server_cmaui_test_nested3Level:
+      - disk.capacity_server_cmaui_4_test_nested4Level
+      network.incoming.packets.rate_template_VMInt_OAM_lb_5_test_nested3Level:
       - test_nested3Level
-      - disk.device.iops_server_cmaui
-      disk.allocation_server_cmaui_test_nested4Level_test_nested3Level:
+      - network.incoming.packets.rate_template_VMInt_OAM_lb_5
+      disk.device.read.bytes.rate_server_cmaui_3_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.device.read.bytes.rate_server_cmaui_3
+      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.incoming.packets.rate_template_VMInt_OAM_lb_4:
       - template_VMInt_OAM_lb_4
       - network.incoming.packets.rate
       network.incoming.packets.rate_template_VMInt_OAM_lb_3:
       - template_VMInt_OAM_lb_3
       - network.incoming.packets.rate
-      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.outgoing.packets.rate_template_VMInt_OAM_lb_5_test_nested3Level:
       - test_nested3Level
       - network.outgoing.packets.rate_template_VMInt_OAM_lb_5
-      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.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.outgoing.bytes_template_VMInt_OAM_lb_6_test_nested3Level:
       - test_nested3Level
       - network.outgoing.bytes_template_VMInt_OAM_lb_6
       feature_template_VMInt_OAM_lb_4:
       - template_VMInt_OAM_lb_4
       - feature
-      disk.device.read.requests_server_cmaui:
-      - server_cmaui
-      - disk.device.read.requests
       binding_template_VMInt_OAM_lb_6_test_nested3Level:
       - test_nested3Level
       - binding_template_VMInt_OAM_lb_6
       feature_template_VMInt_OAM_lb_3:
       - template_VMInt_OAM_lb_3
       - feature
-      memory_server_cmaui:
-      - server_cmaui
-      - memory
+      os_server_cmaui_2:
+      - server_cmaui_2
+      - os
+      disk.read.requests_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - disk.read.requests_server_cmaui_4_test_nested4Level
       network.incoming.packets.rate_template_VMInt_OAM_lb_8_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.incoming.packets.rate_template_VMInt_OAM_lb_8_test_nested4Level
-      disk.read.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level:
+      scalable_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - disk.read.bytes.rate_server_cmaui_test_nested4Level
-      disk.read.requests_server_cmaui_test_nested3Level:
-      - test_nested3Level
-      - disk.read.requests_server_cmaui
+      - scalable_server_cmaui_4_test_nested4Level
       network.incoming.bytes_template_VMInt_OAM_lb_7_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.incoming.bytes_template_VMInt_OAM_lb_7_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
       network.incoming.bytes_template_VMInt_OAM_lb_6_test_nested3Level:
       - test_nested3Level
       - network.incoming.bytes_template_VMInt_OAM_lb_6
-      disk.device.write.requests.rate_server_cmaui_test_nested4Level_test_nested3Level:
+      disk.device.allocation_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.allocation
+      network.outpoing.packets_template_VMInt_OAM_lb_7_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - disk.device.write.requests.rate_server_cmaui_test_nested4Level
-      disk.device.read.requests.rate_server_cmaui:
-      - server_cmaui
-      - disk.device.read.requests.rate
-      feature_server_cmaui_test_nested4Level_test_nested3Level:
+      - network.outpoing.packets_template_VMInt_OAM_lb_7_test_nested4Level
+      disk.device.latency_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - feature_server_cmaui_test_nested4Level
-      binding_server_cmaui_test_nested4Level_test_nested3Level:
+      - disk.device.latency_server_cmaui_4_test_nested4Level
+      disk.read.bytes_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - binding_server_cmaui_test_nested4Level
-      network.outpoing.packets_template_VMInt_OAM_lb_7_test_nested4Level_test_nested3Level:
+      - disk.read.bytes_server_cmaui_3
+      disk.latency_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - network.outpoing.packets_template_VMInt_OAM_lb_7_test_nested4Level
-      disk.read.bytes_server_cmaui_test_nested4Level_test_nested3Level:
+      - disk.latency_server_cmaui_4_test_nested4Level
+      disk.device.allocation_server_cmaui_3_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.allocation_server_cmaui_3
+      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
-      - host_server_cmaui
-      scalable_server_cmaui_test_nested4Level_test_nested3Level:
+      - disk.write.requests_server_cmaui_4_test_nested4Level
+      binding_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - scalable_server_cmaui_test_nested4Level
+      - 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_template_VMInt_OAM_lb_7_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.outgoing.packets.rate_template_VMInt_OAM_lb_7_test_nested4Level
@@ -599,133 +590,139 @@ topology_template:
       network.outgoing.bytes.rate_template_VMInt_OAM_lb_5_test_nested3Level:
       - test_nested3Level
       - network.outgoing.bytes.rate_template_VMInt_OAM_lb_5
+      cpu_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - cpu_server_cmaui_4_test_nested4Level
+      cpu.delta_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - cpu.delta_server_cmaui_3
       network.outgoing.packets.rate_template_VMInt_OAM_lb_3:
       - template_VMInt_OAM_lb_3
       - network.outgoing.packets.rate
-      disk.read.bytes.rate_server_cmaui_test_nested3Level:
+      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:
-      - test_nested3Level
-      - disk.device.write.requests.rate_server_cmaui
+      - disk.device.write.bytes.rate_server_cmaui_4_test_nested4Level
       network.incoming.packets_template_VMInt_OAM_lb_8_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.incoming.packets_template_VMInt_OAM_lb_8_test_nested4Level
       binding_template_VMInt_OAM_lb_8_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - binding_template_VMInt_OAM_lb_8_test_nested4Level
-      disk.capacity_server_cmaui_test_nested3Level:
+      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.outpoing.packets_template_VMInt_OAM_lb_6_test_nested3Level:
       - test_nested3Level
       - network.outpoing.packets_template_VMInt_OAM_lb_6
-      memory.resident_server_cmaui:
-      - server_cmaui
-      - memory.resident
-      disk.device.allocation_server_cmaui_test_nested4Level_test_nested3Level:
+      endpoint_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - disk.device.allocation_server_cmaui_test_nested4Level
-      disk.write.requests_server_cmaui_test_nested3Level:
+      - endpoint_server_cmaui_3
+      vcpus_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - disk.write.requests_server_cmaui
-      disk.latency_server_cmaui:
-      - server_cmaui
-      - disk.latency
-      vcpus_server_cmaui:
-      - server_cmaui
-      - vcpus
-      disk.device.write.bytes_server_cmaui:
-      - server_cmaui
-      - disk.device.write.bytes
-      instance_server_cmaui_test_nested3Level:
+      - vcpus_server_cmaui_3
+      disk.allocation_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - instance_server_cmaui
-      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:
+      - disk.allocation_server_cmaui_4_test_nested4Level
+      disk.device.write.bytes_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - cpu_server_cmaui
-      disk.usage_server_cmaui_test_nested3Level:
+      - disk.device.write.bytes_server_cmaui_3
+      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.usage_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.incoming.packets_template_VMInt_OAM_lb_6_test_nested3Level:
       - test_nested3Level
       - network.incoming.packets_template_VMInt_OAM_lb_6
-      disk.write.bytes_server_cmaui_test_nested3Level:
+      disk.device.write.requests_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - disk.write.bytes_server_cmaui
-      scalable_server_cmaui_test_nested3Level:
+      - disk.device.write.requests_server_cmaui_4_test_nested4Level
+      disk.capacity_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - scalable_server_cmaui
-      endpoint_server_cmaui:
-      - server_cmaui
-      - endpoint
-      cpu.delta_server_cmaui_test_nested4Level_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
+      binding_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - cpu.delta_server_cmaui_test_nested4Level
-      disk.device.iops_server_cmaui_test_nested4Level_test_nested3Level:
+      - binding_server_cmaui_4_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.iops_server_cmaui_test_nested4Level
-      disk.write.bytes.rate_server_cmaui_test_nested3Level:
+      - disk.device.write.requests.rate_server_cmaui_4_test_nested4Level
+      disk.write.bytes_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - disk.write.bytes.rate_server_cmaui
-      disk.device.read.requests.rate_server_cmaui_test_nested3Level:
+      - disk.write.bytes_server_cmaui_4_test_nested4Level
+      disk.device.read.requests_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - disk.device.read.requests.rate_server_cmaui
-      disk.read.requests_server_cmaui_test_nested4Level_test_nested3Level:
+      - disk.device.read.requests_server_cmaui_3
+      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
       feature_template_VMInt_OAM_lb_6_test_nested3Level:
       - test_nested3Level
       - feature_template_VMInt_OAM_lb_6
+      disk.device.read.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - disk.device.read.requests.rate_server_cmaui_4_test_nested4Level
       network.incoming.bytes.rate_template_VMInt_OAM_lb_7_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.incoming.bytes.rate_template_VMInt_OAM_lb_7_test_nested4Level
       network.outgoing.packets.rate_template_VMInt_OAM_lb_8_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.outgoing.packets.rate_template_VMInt_OAM_lb_8_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
+      - memory.resident_server_cmaui_3
+      memory.usage_server_cmaui_2:
+      - server_cmaui_2
+      - memory.usage
       network.incoming.packets_template_VMInt_OAM_lb_7_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.incoming.packets_template_VMInt_OAM_lb_7_test_nested4Level
-      disk.latency_server_cmaui_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.latency_server_cmaui_test_nested4Level
     requirements:
       dependency_template_VMInt_OAM_lb_5_test_nested3Level:
       - test_nested3Level
       - dependency_template_VMInt_OAM_lb_5
-      dependency_server_cmaui_test_nested3Level:
-      - test_nested3Level
-      - dependency_server_cmaui
       link_template_VMInt_OAM_lb_7_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - link_template_VMInt_OAM_lb_7_test_nested4Level
       dependency_template_VMInt_OAM_lb_8_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - dependency_template_VMInt_OAM_lb_8_test_nested4Level
-      dependency_server_cmaui:
-      - server_cmaui
-      - dependency
+      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
+      - local_storage_server_cmaui_3
       link_template_VMInt_OAM_lb_5_test_nested3Level:
       - test_nested3Level
       - link_template_VMInt_OAM_lb_5
-      local_storage_server_cmaui_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - local_storage_server_cmaui_test_nested4Level
       dependency_template_VMInt_OAM_lb_3:
       - template_VMInt_OAM_lb_3
       - dependency
@@ -735,18 +732,18 @@ topology_template:
       dependency_template_VMInt_OAM_lb_4:
       - template_VMInt_OAM_lb_4
       - dependency
+      local_storage_server_cmaui_2:
+      - server_cmaui_2
+      - local_storage
       dependency_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - dependency_test_nested4Level
-      local_storage_server_cmaui:
-      - server_cmaui
-      - local_storage
       link_template_VMInt_OAM_lb_3:
       - template_VMInt_OAM_lb_3
       - link
-      dependency_server_cmaui_test_nested4Level_test_nested3Level:
+      dependency_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - dependency_server_cmaui_test_nested4Level
+      - dependency_server_cmaui_3
       dependency_template_VMInt_OAM_lb_6_test_nested3Level:
       - test_nested3Level
       - dependency_template_VMInt_OAM_lb_6
@@ -756,12 +753,15 @@ topology_template:
       dependency_template_VMInt_OAM_lb_7_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - dependency_template_VMInt_OAM_lb_7_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
+      dependency_server_cmaui_2:
+      - server_cmaui_2
+      - dependency
       link_template_VMInt_OAM_lb_6_test_nested3Level:
       - test_nested3Level
-      - link_template_VMInt_OAM_lb_6
-      local_storage_server_cmaui_test_nested3Level:
-      - test_nested3Level
-      - local_storage_server_cmaui
\ No newline at end of file
+      - link_template_VMInt_OAM_lb_6
\ 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/VMInterfaceToNettworkConnection/sharedNestedMultiLevels/expectedoutputfiles/nested3ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/sharedNestedMultiLevels/expectedoutputfiles/nested3ServiceTemplate.yaml
index 67666e3fee..3280a0e588 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/sharedNestedMultiLevels/expectedoutputfiles/nested3ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/sharedNestedMultiLevels/expectedoutputfiles/nested3ServiceTemplate.yaml
@@ -86,7 +86,7 @@ topology_template:
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
-          node: server_cmaui
+          node: server_cmaui_3
           relationship: tosca.relationships.network.BindsTo
     test_nested4Level:
       type: org.openecomp.resource.abstract.nodes.heat.nested4
@@ -115,9 +115,9 @@ topology_template:
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
-          node: server_cmaui
+          node: server_cmaui_3
           relationship: tosca.relationships.network.BindsTo
-    server_cmaui:
+    server_cmaui_3:
       type: org.openecomp.resource.vfc.nodes.heat.cmaui
       properties:
         flavor:
@@ -141,265 +141,265 @@ topology_template:
       - template_VMInt_OAM_lb_5
       - test_nested4Level
       - template_VMInt_OAM_lb_6
-      - server_cmaui
+      - server_cmaui_3
   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:
-      - 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:
+      memory.usage_server_cmaui_4_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
+      - 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
       network.incoming.bytes.rate_template_VMInt_OAM_lb_7_test_nested4Level:
       - test_nested4Level
       - network.incoming.bytes.rate_template_VMInt_OAM_lb_7
-      disk.write.bytes_server_cmaui_test_nested4Level:
+      disk.read.requests_server_cmaui_4_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:
-      - 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.write.bytes.rate_server_cmaui_4
       binding_template_VMInt_OAM_lb_6:
       - template_VMInt_OAM_lb_6
       - binding
       binding_template_VMInt_OAM_lb_5:
       - template_VMInt_OAM_lb_5
       - binding
-      disk.device.usage_server_cmaui_test_nested4Level:
+      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
       network.incoming.bytes_template_VMInt_OAM_lb_6:
       - template_VMInt_OAM_lb_6
       - network.incoming.bytes
       network.incoming.bytes_template_VMInt_OAM_lb_5:
       - template_VMInt_OAM_lb_5
       - network.incoming.bytes
+      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
+      feature_server_cmaui_4_test_nested4Level:
+      - test_nested4Level
+      - feature_server_cmaui_4
       network.incoming.packets_template_VMInt_OAM_lb_7_test_nested4Level:
       - test_nested4Level
       - network.incoming.packets_template_VMInt_OAM_lb_7
-      instance_server_cmaui:
-      - server_cmaui
-      - instance
-      disk.latency_server_cmaui_test_nested4Level:
+      disk.capacity_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:
+      - disk.capacity_server_cmaui_4
+      disk.read.bytes_server_cmaui_3:
+      - server_cmaui_3
+      - disk.read.bytes
+      disk.device.write.bytes.rate_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.device.capacity_server_cmaui
-      disk.root.size_server_cmaui:
-      - server_cmaui
-      - disk.root.size
-      host_server_cmaui_test_nested4Level:
+      - disk.device.write.bytes.rate_server_cmaui_4
+      disk.device.read.requests_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - host_server_cmaui
+      - disk.device.read.requests_server_cmaui_4
       network.incoming.packets.rate_template_VMInt_OAM_lb_8_test_nested4Level:
       - test_nested4Level
       - network.incoming.packets.rate_template_VMInt_OAM_lb_8
+      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
       network.incoming.packets_template_VMInt_OAM_lb_8_test_nested4Level:
       - test_nested4Level
       - network.incoming.packets_template_VMInt_OAM_lb_8
+      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.bytes_template_VMInt_OAM_lb_8_test_nested4Level:
       - test_nested4Level
       - network.incoming.bytes_template_VMInt_OAM_lb_8
-      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:
+      os_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.device.read.requests.rate_server_cmaui
+      - os_server_cmaui_4
       network.outpoing.packets_template_VMInt_OAM_lb_5:
       - template_VMInt_OAM_lb_5
       - network.outpoing.packets
-      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
+      - cpu.delta_server_cmaui_4
+      disk.capacity_server_cmaui_3:
+      - server_cmaui_3
+      - disk.capacity
+      disk.device.capacity_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.allocation_server_cmaui
+      - disk.device.capacity_server_cmaui_4
       network.outgoing.bytes_template_VMInt_OAM_lb_5:
       - template_VMInt_OAM_lb_5
       - network.outgoing.bytes
       network.outgoing.bytes_template_VMInt_OAM_lb_6:
       - template_VMInt_OAM_lb_6
       - network.outgoing.bytes
-      disk.device.write.bytes.rate_server_cmaui_test_nested4Level:
-      - test_nested4Level
-      - disk.device.write.bytes.rate_server_cmaui
-      disk.device.write.bytes_server_cmaui_test_nested4Level:
+      scalable_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.device.write.bytes_server_cmaui
-      disk.device.write.requests.rate_server_cmaui_test_nested4Level:
+      - scalable_server_cmaui_4
+      disk.device.iops_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.device.write.requests.rate_server_cmaui
-      disk.device.iops_server_cmaui_test_nested4Level:
-      - test_nested4Level
-      - disk.device.iops_server_cmaui
+      - disk.device.iops_server_cmaui_4
       network.outpoing.packets_template_VMInt_OAM_lb_6:
       - template_VMInt_OAM_lb_6
       - network.outpoing.packets
+      disk.read.bytes.rate_server_cmaui_4_test_nested4Level:
+      - test_nested4Level
+      - disk.read.bytes.rate_server_cmaui_4
       network.incoming.bytes.rate_template_VMInt_OAM_lb_8_test_nested4Level:
       - test_nested4Level
       - network.incoming.bytes.rate_template_VMInt_OAM_lb_8
-      disk.read.requests_server_cmaui_test_nested4Level:
+      endpoint_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.read.requests_server_cmaui
-      disk.ephemeral.size_server_cmaui_test_nested4Level:
-      - test_nested4Level
-      - disk.ephemeral.size_server_cmaui
-      binding_server_cmaui_test_nested4Level:
-      - test_nested4Level
-      - binding_server_cmaui
+      - endpoint_server_cmaui_4
       network.outpoing.packets_template_VMInt_OAM_lb_7_test_nested4Level:
       - test_nested4Level
       - network.outpoing.packets_template_VMInt_OAM_lb_7
-      disk.usage_server_cmaui_test_nested4Level:
+      vcpus_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.usage_server_cmaui
+      - vcpus_server_cmaui_4
       network.outgoing.bytes.rate_template_VMInt_OAM_lb_5:
       - template_VMInt_OAM_lb_5
       - network.outgoing.bytes.rate
       network.outgoing.bytes.rate_template_VMInt_OAM_lb_6:
       - template_VMInt_OAM_lb_6
       - network.outgoing.bytes.rate
-      feature_server_cmaui:
-      - server_cmaui
-      - feature
+      disk.device.write.requests_server_cmaui_3:
+      - server_cmaui_3
+      - disk.device.write.requests
       network.incoming.bytes.rate_template_VMInt_OAM_lb_5:
       - template_VMInt_OAM_lb_5
       - network.incoming.bytes.rate
+      disk.write.bytes_server_cmaui_4_test_nested4Level:
+      - test_nested4Level
+      - disk.write.bytes_server_cmaui_4
       network.incoming.bytes.rate_template_VMInt_OAM_lb_6:
       - template_VMInt_OAM_lb_6
       - network.incoming.bytes.rate
-      memory.usage_server_cmaui:
-      - server_cmaui
-      - memory.usage
+      disk.write.requests.rate_server_cmaui_4_test_nested4Level:
+      - test_nested4Level
+      - disk.write.requests.rate_server_cmaui_4
+      disk.iops_server_cmaui_3:
+      - server_cmaui_3
+      - disk.iops
       network.incoming.packets_template_VMInt_OAM_lb_5:
       - template_VMInt_OAM_lb_5
       - network.incoming.packets
       network.outgoing.bytes_template_VMInt_OAM_lb_7_test_nested4Level:
       - test_nested4Level
       - network.outgoing.bytes_template_VMInt_OAM_lb_7
-      disk.ephemeral.size_server_cmaui:
-      - server_cmaui
-      - disk.ephemeral.size
       network.incoming.packets_template_VMInt_OAM_lb_6:
       - template_VMInt_OAM_lb_6
       - network.incoming.packets
       binding_template_VMInt_OAM_lb_7_test_nested4Level:
       - test_nested4Level
       - binding_template_VMInt_OAM_lb_7
-      feature_server_cmaui_test_nested4Level:
-      - test_nested4Level
-      - feature_server_cmaui
-      disk.read.bytes.rate_server_cmaui_test_nested4Level:
-      - test_nested4Level
-      - disk.read.bytes.rate_server_cmaui
       network.outgoing.bytes.rate_template_VMInt_OAM_lb_8_test_nested4Level:
       - test_nested4Level
       - network.outgoing.bytes.rate_template_VMInt_OAM_lb_8
-      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
       network.outgoing.packets.rate_template_VMInt_OAM_lb_7_test_nested4Level:
       - test_nested4Level
       - network.outgoing.packets.rate_template_VMInt_OAM_lb_7
-      disk.device.read.bytes.rate_server_cmaui_test_nested4Level:
-      - test_nested4Level
-      - disk.device.read.bytes.rate_server_cmaui
-      disk.device.allocation_server_cmaui_test_nested4Level:
-      - test_nested4Level
-      - disk.device.allocation_server_cmaui
-      disk.device.write.requests_server_cmaui_test_nested4Level:
+      disk.device.write.bytes_server_cmaui_3:
+      - server_cmaui_3
+      - disk.device.write.bytes
+      disk.iops_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.device.write.requests_server_cmaui
-      cpu_server_cmaui:
-      - server_cmaui
-      - cpu
-      disk.write.bytes.rate_server_cmaui_test_nested4Level:
+      - disk.iops_server_cmaui_4
+      feature_server_cmaui_3:
+      - server_cmaui_3
+      - feature
+      cpu_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.write.bytes.rate_server_cmaui
-      disk.write.requests.rate_server_cmaui_test_nested4Level:
+      - cpu_server_cmaui_4
+      disk.write.bytes_server_cmaui_3:
+      - server_cmaui_3
+      - disk.write.bytes
+      disk.allocation_server_cmaui_3:
+      - server_cmaui_3
+      - disk.allocation
+      binding_server_cmaui_3:
+      - server_cmaui_3
+      - binding
+      vcpus_server_cmaui_3:
+      - server_cmaui_3
+      - vcpus
+      instance_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.write.requests.rate_server_cmaui
-      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.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
+      - instance_server_cmaui_4
+      scalable_server_cmaui_3:
+      - server_cmaui_3
+      - scalable
       network.outgoing.packets.rate_template_VMInt_OAM_lb_8_test_nested4Level:
       - test_nested4Level
       - network.outgoing.packets.rate_template_VMInt_OAM_lb_8
-      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.write.requests_server_cmaui_3:
+      - server_cmaui_3
+      - disk.write.requests
+      disk.usage_server_cmaui_3:
+      - server_cmaui_3
+      - disk.usage
       feature_template_VMInt_OAM_lb_7_test_nested4Level:
       - test_nested4Level
       - feature_template_VMInt_OAM_lb_7
+      disk.device.write.bytes_server_cmaui_4_test_nested4Level:
+      - test_nested4Level
+      - disk.device.write.bytes_server_cmaui_4
       network.incoming.packets.rate_template_VMInt_OAM_lb_6:
       - template_VMInt_OAM_lb_6
       - network.incoming.packets.rate
@@ -409,57 +409,60 @@ topology_template:
       network.incoming.packets.rate_template_VMInt_OAM_lb_5:
       - template_VMInt_OAM_lb_5
       - network.incoming.packets.rate
-      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_template_VMInt_OAM_lb_5:
       - template_VMInt_OAM_lb_5
       - feature
-      endpoint_server_cmaui_test_nested4Level:
-      - test_nested4Level
-      - endpoint_server_cmaui
-      memory_server_cmaui:
-      - server_cmaui
-      - memory
-      cpu.delta_server_cmaui_test_nested4Level:
+      endpoint_server_cmaui_3:
+      - server_cmaui_3
+      - endpoint
+      memory_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - cpu.delta_server_cmaui
+      - memory_server_cmaui_4
       network.incoming.packets.rate_template_VMInt_OAM_lb_7_test_nested4Level:
       - test_nested4Level
       - network.incoming.packets.rate_template_VMInt_OAM_lb_7
-      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
-      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
+      - disk.root.size_server_cmaui_4
+      disk.usage_server_cmaui_4_test_nested4Level:
+      - 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.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.read.bytes_server_cmaui_4
+      disk.allocation_server_cmaui_4_test_nested4Level:
+      - test_nested4Level
+      - disk.allocation_server_cmaui_4
       network.outpoing.packets_template_VMInt_OAM_lb_8_test_nested4Level:
       - test_nested4Level
       - network.outpoing.packets_template_VMInt_OAM_lb_8
+      disk.device.allocation_server_cmaui_4_test_nested4Level:
+      - test_nested4Level
+      - disk.device.allocation_server_cmaui_4
       network.outgoing.bytes_template_VMInt_OAM_lb_8_test_nested4Level:
       - test_nested4Level
       - network.outgoing.bytes_template_VMInt_OAM_lb_8
-      disk.read.bytes_server_cmaui_test_nested4Level:
-      - test_nested4Level
-      - disk.read.bytes_server_cmaui
-      disk.device.read.requests_server_cmaui_test_nested4Level:
-      - test_nested4Level
-      - disk.device.read.requests_server_cmaui
-      disk.write.requests_server_cmaui_test_nested4Level:
-      - test_nested4Level
-      - disk.write.requests_server_cmaui
-      disk.device.latency_server_cmaui_test_nested4Level:
+      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.outgoing.packets.rate_template_VMInt_OAM_lb_6:
       - template_VMInt_OAM_lb_6
       - network.outgoing.packets.rate
@@ -472,61 +475,58 @@ topology_template:
       feature_test_nested4Level:
       - test_nested4Level
       - feature
-      os_server_cmaui_test_nested4Level:
-      - test_nested4Level
-      - os_server_cmaui
-      memory.resident_server_cmaui:
-      - server_cmaui
-      - memory.resident
-      memory.usage_server_cmaui_test_nested4Level:
-      - test_nested4Level
-      - memory.usage_server_cmaui
-      disk.latency_server_cmaui:
-      - server_cmaui
-      - disk.latency
-      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:
+      instance_server_cmaui_3:
+      - server_cmaui_3
+      - instance
+      disk.read.bytes.rate_server_cmaui_3:
+      - server_cmaui_3
+      - disk.read.bytes.rate
+      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.outgoing.bytes.rate_template_VMInt_OAM_lb_7_test_nested4Level:
       - test_nested4Level
       - network.outgoing.bytes.rate_template_VMInt_OAM_lb_7
-      disk.allocation_server_cmaui:
-      - server_cmaui
-      - disk.allocation
-      disk.write.requests_server_cmaui:
-      - server_cmaui
-      - disk.write.requests
-      endpoint_server_cmaui:
-      - server_cmaui
-      - endpoint
+      disk.device.read.requests_server_cmaui_3:
+      - server_cmaui_3
+      - disk.device.read.requests
+      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
       network.incoming.bytes_template_VMInt_OAM_lb_7_test_nested4Level:
       - test_nested4Level
       - network.incoming.bytes_template_VMInt_OAM_lb_7
       binding_template_VMInt_OAM_lb_8_test_nested4Level:
       - test_nested4Level
       - binding_template_VMInt_OAM_lb_8
+      disk.latency_server_cmaui_3:
+      - server_cmaui_3
+      - disk.latency
+      memory.usage_server_cmaui_3:
+      - server_cmaui_3
+      - memory.usage
     requirements:
-      dependency_server_cmaui:
-      - server_cmaui
-      - dependency
+      local_storage_server_cmaui_4_test_nested4Level:
+      - test_nested4Level
+      - local_storage_server_cmaui_4
       dependency_template_VMInt_OAM_lb_5:
       - template_VMInt_OAM_lb_5
       - dependency
       dependency_template_VMInt_OAM_lb_6:
       - template_VMInt_OAM_lb_6
       - dependency
-      local_storage_server_cmaui_test_nested4Level:
-      - test_nested4Level
-      - local_storage_server_cmaui
+      local_storage_server_cmaui_3:
+      - server_cmaui_3
+      - local_storage
       dependency_template_VMInt_OAM_lb_8_test_nested4Level:
       - test_nested4Level
       - dependency_template_VMInt_OAM_lb_8
@@ -536,12 +536,6 @@ topology_template:
       link_template_VMInt_OAM_lb_8_test_nested4Level:
       - test_nested4Level
       - link_template_VMInt_OAM_lb_8
-      local_storage_server_cmaui:
-      - server_cmaui
-      - local_storage
-      dependency_server_cmaui_test_nested4Level:
-      - test_nested4Level
-      - dependency_server_cmaui
       link_template_VMInt_OAM_lb_5:
       - template_VMInt_OAM_lb_5
       - link
@@ -551,6 +545,12 @@ topology_template:
       link_template_VMInt_OAM_lb_6:
       - template_VMInt_OAM_lb_6
       - link
+      dependency_server_cmaui_4_test_nested4Level:
+      - test_nested4Level
+      - dependency_server_cmaui_4
+      dependency_server_cmaui_3:
+      - server_cmaui_3
+      - dependency
       link_template_VMInt_OAM_lb_7_test_nested4Level:
       - test_nested4Level
       - link_template_VMInt_OAM_lb_7
\ 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/VMInterfaceToNettworkConnection/sharedNestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/sharedNestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.yaml
index fbaabc194c..4189c1eda5 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/sharedNestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/sharedNestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.yaml
@@ -82,7 +82,7 @@ topology_template:
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
-          node: server_cmaui
+          node: server_cmaui_4
           relationship: tosca.relationships.network.BindsTo
     template_VMInt_OAM_lb_8:
       type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface
@@ -99,9 +99,9 @@ topology_template:
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
-          node: server_cmaui
+          node: server_cmaui_4
           relationship: tosca.relationships.network.BindsTo
-    server_cmaui:
+    server_cmaui_4:
       type: org.openecomp.resource.vfc.nodes.heat.cmaui
       properties:
         flavor:
@@ -124,118 +124,118 @@ topology_template:
       members:
       - template_VMInt_OAM_lb_7
       - template_VMInt_OAM_lb_8
-      - server_cmaui
+      - server_cmaui_4
   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
-      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.device.latency_server_cmaui:
-      - server_cmaui
+      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.write.requests_server_cmaui:
-      - server_cmaui
-      - disk.device.write.requests
-      disk.read.requests_server_cmaui:
-      - server_cmaui
+      disk.device.usage_server_cmaui_4:
+      - server_cmaui_4
+      - disk.device.usage
+      disk.read.requests_server_cmaui_4:
+      - server_cmaui_4
       - disk.read.requests
-      disk.device.capacity_server_cmaui:
-      - server_cmaui
-      - disk.device.capacity
+      disk.allocation_server_cmaui_4:
+      - server_cmaui_4
+      - disk.allocation
+      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
+      scalable_server_cmaui_4:
+      - server_cmaui_4
+      - scalable
       binding_template_VMInt_OAM_lb_8:
       - template_VMInt_OAM_lb_8
       - binding
-      disk.usage_server_cmaui:
-      - server_cmaui
-      - disk.usage
       binding_template_VMInt_OAM_lb_7:
       - template_VMInt_OAM_lb_7
       - binding
-      disk.device.usage_server_cmaui:
-      - server_cmaui
-      - disk.device.usage
       network.incoming.bytes_template_VMInt_OAM_lb_8:
       - template_VMInt_OAM_lb_8
       - network.incoming.bytes
+      disk.write.requests_server_cmaui_4:
+      - server_cmaui_4
+      - disk.write.requests
       network.incoming.bytes_template_VMInt_OAM_lb_7:
       - template_VMInt_OAM_lb_7
       - network.incoming.bytes
-      disk.capacity_server_cmaui:
-      - server_cmaui
-      - disk.capacity
-      disk.write.requests.rate_server_cmaui:
-      - server_cmaui
-      - disk.write.requests.rate
+      disk.usage_server_cmaui_4:
+      - server_cmaui_4
+      - disk.usage
+      disk.device.capacity_server_cmaui_4:
+      - server_cmaui_4
+      - disk.device.capacity
+      disk.device.iops_server_cmaui_4:
+      - server_cmaui_4
+      - disk.device.iops
       network.incoming.packets.rate_template_VMInt_OAM_lb_8:
       - template_VMInt_OAM_lb_8
       - network.incoming.packets.rate
       feature_template_VMInt_OAM_lb_8:
       - template_VMInt_OAM_lb_8
       - feature
+      disk.device.read.bytes.rate_server_cmaui_4:
+      - server_cmaui_4
+      - disk.device.read.bytes.rate
       network.incoming.packets.rate_template_VMInt_OAM_lb_7:
       - template_VMInt_OAM_lb_7
       - network.incoming.packets.rate
       feature_template_VMInt_OAM_lb_7:
       - template_VMInt_OAM_lb_7
       - feature
-      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
+      endpoint_server_cmaui_4:
+      - server_cmaui_4
+      - endpoint
+      disk.read.bytes_server_cmaui_4:
+      - server_cmaui_4
+      - disk.read.bytes
+      os_server_cmaui_4:
+      - server_cmaui_4
+      - os
+      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:
-      - server_cmaui
+      memory_server_cmaui_4:
+      - server_cmaui_4
       - memory
-      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.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.outgoing.packets.rate_template_VMInt_OAM_lb_8:
       - template_VMInt_OAM_lb_8
       - network.outgoing.packets.rate
@@ -245,9 +245,9 @@ topology_template:
       network.outpoing.packets_template_VMInt_OAM_lb_7:
       - template_VMInt_OAM_lb_7
       - network.outpoing.packets
-      memory.resident_server_cmaui:
-      - server_cmaui
-      - memory.resident
+      instance_server_cmaui_4:
+      - server_cmaui_4
+      - instance
       network.outpoing.packets_template_VMInt_OAM_lb_8:
       - template_VMInt_OAM_lb_8
       - network.outpoing.packets
@@ -257,67 +257,64 @@ topology_template:
       network.outgoing.bytes_template_VMInt_OAM_lb_8:
       - template_VMInt_OAM_lb_8
       - network.outgoing.bytes
-      disk.latency_server_cmaui:
-      - server_cmaui
-      - disk.latency
-      feature_server_cmaui:
-      - server_cmaui
-      - feature
-      vcpus_server_cmaui:
-      - server_cmaui
-      - vcpus
-      disk.device.write.bytes_server_cmaui:
-      - server_cmaui
-      - disk.device.write.bytes
+      disk.read.bytes.rate_server_cmaui_4:
+      - server_cmaui_4
+      - disk.read.bytes.rate
       network.outgoing.bytes.rate_template_VMInt_OAM_lb_7:
       - template_VMInt_OAM_lb_7
       - network.outgoing.bytes.rate
+      disk.device.write.requests_server_cmaui_4:
+      - server_cmaui_4
+      - disk.device.write.requests
       network.outgoing.bytes.rate_template_VMInt_OAM_lb_8:
       - template_VMInt_OAM_lb_8
       - network.outgoing.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_4:
+      - server_cmaui_4
+      - disk.device.read.requests
       network.incoming.bytes.rate_template_VMInt_OAM_lb_7:
       - template_VMInt_OAM_lb_7
       - network.incoming.bytes.rate
-      memory.usage_server_cmaui:
-      - server_cmaui
-      - memory.usage
+      disk.iops_server_cmaui_4:
+      - server_cmaui_4
+      - disk.iops
       network.incoming.bytes.rate_template_VMInt_OAM_lb_8:
       - template_VMInt_OAM_lb_8
       - network.incoming.bytes.rate
-      disk.ephemeral.size_server_cmaui:
-      - server_cmaui
-      - disk.ephemeral.size
+      disk.device.read.requests.rate_server_cmaui_4:
+      - server_cmaui_4
+      - disk.device.read.requests.rate
       network.incoming.packets_template_VMInt_OAM_lb_7:
       - template_VMInt_OAM_lb_7
       - network.incoming.packets
       network.incoming.packets_template_VMInt_OAM_lb_8:
       - template_VMInt_OAM_lb_8
       - network.incoming.packets
-      endpoint_server_cmaui:
-      - server_cmaui
-      - endpoint
-      disk.iops_server_cmaui:
-      - server_cmaui
-      - disk.iops
-      disk.device.iops_server_cmaui:
-      - server_cmaui
-      - disk.device.iops
-      disk.read.bytes_server_cmaui:
-      - server_cmaui
-      - disk.read.bytes
+      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
+      disk.latency_server_cmaui_4:
+      - server_cmaui_4
+      - disk.latency
+      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_server_cmaui:
-      - server_cmaui
+      dependency_server_cmaui_4:
+      - server_cmaui_4
       - dependency
-      local_storage_server_cmaui:
-      - server_cmaui
-      - local_storage
       dependency_template_VMInt_OAM_lb_7:
       - template_VMInt_OAM_lb_7
       - dependency
@@ -327,6 +324,9 @@ topology_template:
       link_template_VMInt_OAM_lb_7:
       - template_VMInt_OAM_lb_7
       - link
+      local_storage_server_cmaui_4:
+      - server_cmaui_4
+      - local_storage
       link_template_VMInt_OAM_lb_8:
       - template_VMInt_OAM_lb_8
       - link
\ No newline at end of file